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)
commitf62690cdaf7e59019101b0b4edbaaffe15fd33db
tree97875372c1e8be33ce1b78f074066bd77a20d690
parent9046024ef11863c7fd1d7289362db8945256ce6c
parent909ef30a63032f4cada67303ab022be9b7a458da
Merge "Fix warning: macro redefined"
am: 909ef30a63

Change-Id: Ia1b083546fe41a81acf83e0cb0b8921700aa1bfa