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

Change-Id: I4c8a99271a3553e8d2c117dcf34e5262bf70557b


Trivial merge