Merge "Enable -Werror in launch control builds" am: 5d3110410c am: 84d16a0eb4 am...
authorPyry Haulos <phaulos@google.com>
Tue, 9 Aug 2016 22:42:18 +0000 (22:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 9 Aug 2016 22:42:18 +0000 (22:42 +0000)
commit47a4cc4afc0b2e1b2023f1850b2c731c3bd4bc1e
treeb9084ac8830455f3c77c91cc276a5566df699d0f
parent698d9be9c41df0c9475e707a0c9c2adfd16c351c
parent3e535537e57adb6d96705cbc98a7f568b8fffaf2
Merge "Enable -Werror in launch control builds" am: 5d3110410c am: 84d16a0eb4 am: 478283f842
am: 3e535537e5

Change-Id: I7bb68f09940a50ba4f65e4fe58b8abca371e29c9