Merge "Enable -Werror in launch control builds"
authorPyry Haulos <phaulos@google.com>
Tue, 9 Aug 2016 22:23:02 +0000 (22:23 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 9 Aug 2016 22:23:03 +0000 (22:23 +0000)

Trivial merge