tree e1c1f104200617058d25591bead085b2223cbdaa
parent 61ec157f7d34eed8a20334c005c22ff88a867fa4
parent b5437e3e1bcbfd6e4007ddcbf2050a16926819fe
author Chih-Hung Hsieh <chh@google.com> 1506977317 +0000
committer android-build-merger <android-build-merger@google.com> 1506977317 +0000

Merge "Use -Werror in bootable/recovery" am: 88aa128e22
am: b5437e3e1b

Change-Id: I4ce078f45cc91dc0e868611dd5913b375a029be7