tree bbbd3b7918991412222eb8a534153aa19ef593df
parent fc887a8fbad8c2c557fa4af136e190011dcac1fe
parent 5269808bb03ba9efdd0bda706472b03ad7ccb061
author Tianjie Xu <xunchang@google.com> 1475257703 +0000
committer android-build-merger <android-build-merger@google.com> 1475257703 +0000

Merge "Turn on -Werror for recovery" am: 695ef7cacc
am: 5269808bb0

Change-Id: I84ce95dc0365925535da0d5bfb9397c5b23bd1af