tree d914da4be18ef00a95ba4585e2cec21053db46b4
parent 10e223c18100239bfc55c7ceae1744ed84ab9843
parent 209e5acf4a68faf4afcb19ddb6c20336a939e863
author Tianjie Xu <xunchang@google.com> 1475267664 +0000
committer android-build-merger <android-build-merger@google.com> 1475267664 +0000

Merge "Turn on -Werror for recovery" into nyc-mr1-dev-plus-aosp
am: 209e5acf4a

Change-Id: Ie13be805792a3433d58c2805f8325dfe78795bd4