tree c70089451e810f18fa390fb86dd5672f971c7a8e
parent 67af5301c1c47a84e405713652a2dc5f5a59ecd6
parent 1d49a53ae5b568ab5010ddead599429c273796a5
author Chih-Hung Hsieh <chh@google.com> 1515128628 +0000
committer android-build-merger <android-build-merger@google.com> 1515128628 +0000

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

Change-Id: I3a1a29fb8b0c433d43bb8811b522673e5be5ece6