tree ee5fcc02ba9bc3b7429210016471242df9c3f53d
parent e792fa46292dad655d2012ec6733f0446020c98f
parent 8c403082d66ad0069ee34cc5111f1c17ef7ed90c
author Tianjie Xu <xunchang@google.com> 1475267653 +0000
committer android-build-merger <android-build-merger@google.com> 1475267653 +0000

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

Change-Id: I546d2fd12e3c57fee7ebcf8d3e3a5b56b57f1163