OSDN Git Service

Merge "Disable macro redefined warnings." am: 0a9866d60b am: 9bbfd91413
authorChristopher Ferris <cferris@google.com>
Mon, 27 Feb 2017 20:27:45 +0000 (20:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 27 Feb 2017 20:27:45 +0000 (20:27 +0000)
am: a091d1cfbf

Change-Id: I2077cce88a448ed86bb85b39cba767f930a287e3


Trivial merge