tree 4a8a67e038eede4e7c1f11adce254815e76e2eeb
parent 690dbecf8a72f4910e7ca69fd866de471be1a16c
parent cd3ede20a188f30a7e6bfbf5f0ea056d19e744f4
author Chih-Hung Hsieh <chh@google.com> 1515139163 +0000
committer android-build-merger <android-build-merger@google.com> 1515139163 +0000

Merge "Add correct LOCAL_CFLAGS to compile with global -Werror."
am: cd3ede20a1

Change-Id: I39fabb78d279dbff553efe345eb1a136878b892e