tree c65013e66ff9d724768a4a60e586dd47da985f0b
parent 379571405632a407b8ad0e4cea6a3ec86e5703c1
parent 68460e65505443f29147c16ec506af69ae8fb75e
author Christopher Ferris <cferris@google.com> 1488227027 +0000
committer android-build-merger <android-build-merger@google.com> 1488227027 +0000

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

Change-Id: I2ab788b91292461be1610a8ee9e657bfe5b73038