OSDN Git Service

Merge "Undef before redefining macros" am: 028c26c2d0 am: 46fbc9c701
authorJiyong Park <jiyong@google.com>
Sun, 22 Oct 2017 12:45:11 +0000 (12:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 22 Oct 2017 12:45:11 +0000 (12:45 +0000)
am: f0f159e557

Change-Id: I127ffb4a7fada980f31271bac18e3640bcaf7547


Trivial merge