OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0ad3235 d1f7b9d)
Merge "Fix warning: macro redefined" am: 909ef30a63 am: f62690cdaf
authorYunlian Jiang <yunlian@google.com>
Fri, 3 Feb 2017 02:51:14 +0000 (02:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Feb 2017 02:51:14 +0000 (02:51 +0000)
am: d1f7b9d025

Change-Id: Ifa71e97d5ade8685f2f31400afd1727034321b4d


Trivial merge
frameworks/native
About OSDN
Find Software
Develop Software
Help