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

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

Change-Id: Idce0e224974ab122332951befd15972e1b2a166e