OSDN Git Service

Merge "Fix warning: macro redefined"
authorYunlian Jiang <yunlian@google.com>
Fri, 3 Feb 2017 02:46:15 +0000 (02:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Feb 2017 02:46:15 +0000 (02:46 +0000)
am: 909ef30a63

Change-Id: Ia1b083546fe41a81acf83e0cb0b8921700aa1bfa


Trivial merge