tree 98edb6021753eec604eb1105c45b4e8e7fa569a3
parent 7582609d6196552fc15204043b39972bb6b906a0
parent 695ef7cacc128efc0b710cb25d39c72da2eaef36
author Tianjie Xu <xunchang@google.com> 1475257535 +0000
committer android-build-merger <android-build-merger@google.com> 1475257535 +0000

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

Change-Id: If8cb1fd9470c4ae6798dc4ecf1707c5eb40b877e