tree 2d57e9e87d4df17237a91eca2b6b97fe6f7ca0c0
parent 3a098ee1f89c398b9d6e7b5dfae9c694994f8bc4
parent a7c216da89540d5e36a41654364e3ea79fe32f17
author Chih-Hung Hsieh <chh@google.com> 1515124750 +0000
committer android-build-merger <android-build-merger@google.com> 1515124750 +0000

Merge "Suppress warnings to compile with global -Werror." am: 251977ebbb
am: a7c216da89

Change-Id: Ib9a3be79ee96d540156e0f487daf00e2941b842a