tree 77030e4a132596316778cbb24efcc149c4646823
parent 9f1b8efc7b27b9b2e0894a1503e58de0b00b7e52
parent 4cf96b16321c3f80ac11ed1e89aa196e938a88bc
author Chih-Hung Hsieh <chh@google.com> 1506978522 +0000
committer android-build-merger <android-build-merger@google.com> 1506978522 +0000

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

Change-Id: I2b0411c99620d2363b962515057c4e845fd149d7