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)
commit478283f84266cacfaab65b1a1e1cdaa5f2c49333
treeb9084ac8830455f3c77c91cc276a5566df699d0f
parent51879177a6a3897986bcc8cae7f1d6148e44be58
parent84d16a0eb45211ccdfafb62ded7e0786e1d9f8bf
Merge "Enable -Werror in launch control builds" am: 5d3110410c
am: 84d16a0eb4

Change-Id: Id2e3b1407de017ff5a9ffa84e670a09d7b2e6b18