tree a2e264ba51c1e6848306371a1123d4bd79fe7a85
parent 4c3f6ab8f7be21acf33ff0dfabec9047aac36e3c
parent dbde5cf1d5b76b6cee3f22e17b05881551ac8d8b
author Tianjie Xu <xunchang@google.com> 1475267238 +0000
committer android-build-merger <android-build-merger@google.com> 1475267238 +0000

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

Change-Id: I0649c3db276212804118ab4a6d7ced150585af91