Merge "Enable -Werror in launch control builds" am: 5d3110410c
authorPyry Haulos <phaulos@google.com>
Tue, 9 Aug 2016 22:36:17 +0000 (22:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 9 Aug 2016 22:36:17 +0000 (22:36 +0000)
am: 84d16a0eb4

Change-Id: Id2e3b1407de017ff5a9ffa84e670a09d7b2e6b18


Trivial merge