tree 831cc567a37abf91c2ef424e0e9830f57b598375
parent 99c796c56a1bf3335b295d41d9456dabfec88e77
parent 89cc8a57f4ca15b766b87193a6993d90422446a7
author Stephen Hines <srhines@google.com> 1468972344 +0000
committer android-build-merger <android-build-merger@google.com> 1468972344 +0000

Merge \\"Disable warnings triggered in Clang r271374\\" am: fa1a21d085
am: 89cc8a57f4

Change-Id: Ibf67e2b6ca9cbeef3e3c97efbcdeaf7d97563e39