OSDN Git Service

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

Change-Id: I99cf61b4953f53f349518b64ad1c84d3e3de7037


Trivial merge