tree c70089451e810f18fa390fb86dd5672f971c7a8e
parent 8203a3f918022fa055084724df4b14d63d4c8937
parent 7516becc84b834b8cf37821f46ef3c4136ed2b7b
author Chih-Hung Hsieh <chh@google.com> 1515128298 +0000
committer android-build-merger <android-build-merger@google.com> 1515128298 +0000

Merge "Add -Wno-error to compile with global -Werror."
am: 7516becc84

Change-Id: Iee0b622f5ca806655232812a1f26e0a587239eb6