tree c65013e66ff9d724768a4a60e586dd47da985f0b
parent 379571405632a407b8ad0e4cea6a3ec86e5703c1
parent 3fd572943a18b4929be632d481e65a6c98740004
author Christopher Ferris <cferris@google.com> 1488226627 +0000
committer android-build-merger <android-build-merger@google.com> 1488226627 +0000

Merge "Disable macro redefined warnings."
am: 3fd572943a

Change-Id: I9bb29b38c53adf95a4bbe3d577ccf7a0bf912b98