tree e536f79d52118bec67d6d4cc679013da684d3180
parent ff1995bbe9cbcebfebadfaa9b82d4d86ae3c4400
parent 78628913ee1bd0261107591b59f46a94318c6bf0
author Chih-Hung Hsieh <chh@google.com> 1515146578 +0000
committer android-build-merger <android-build-merger@google.com> 1515146578 +0000

Merge "Add -Wno-error to compile with global -Werror."
am: 78628913ee

Change-Id: Idce1c0da267017db9d2f8dba402c84175da91017