OSDN Git Service

resolve merge conflicts of 0af9505 to nyc-dev-plus-aosp
authorGlenn Kasten <gkasten@google.com>
Thu, 31 Mar 2016 16:40:13 +0000 (16:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 31 Mar 2016 16:40:13 +0000 (16:40 +0000)
commit1142b765903bac235c049d4eebbd6abb1cebe6d0
treeb2311ca6955d946b6f12a086cac34a9066718120
parent0a77151158bb54a42f1b9041aed2a98d5344b570
parentf0bcb9e6f2b18eeebe8ceea49b0d7d0418b0cbbe
resolve merge conflicts of 0af9505 to nyc-dev-plus-aosp
am: f0bcb9e

* commit 'f0bcb9e6f2b18eeebe8ceea49b0d7d0418b0cbbe':
  Revert "Revert "Make build warnings be errors""

Change-Id: Id457efd1d82bb986ca583fd05f726fd3fcfa23fa