tree 17cd35286e2dd6919ab03386e514fddb1d813a39
parent d5cbea133f5048ee630d3a0315c0ac4f9d61dce8
parent 76f53c87df2be70c95ba557920746e9db64c4fa8
author Christopher Ferris <cferris@google.com> 1488227019 +0000
committer android-build-merger <android-build-merger@google.com> 1488227019 +0000

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

Change-Id: I6762418a2a5300bce2a19f72f2c95220328923fd