tree 17cd35286e2dd6919ab03386e514fddb1d813a39
parent bd8747b5ac5dd2078438a1c4f0394a789906e5c9
parent d55eeac3245477aa15d4f9a60122bcdc27bb1aa2
author Christopher Ferris <cferris@google.com> 1488227263 +0000
committer android-build-merger <android-build-merger@google.com> 1488227263 +0000

Disable macro redefined warnings. am: 2a1020b73b am: 76f53c87df
am: d55eeac324

Change-Id: Ic6c3f477acadff3927958f5e08f1972bbf57ecc0