OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1f24f0f 9d5dd3f)
resolve merge conflicts of 13c5c34 to mnc-dev am: 79b74d787d am: abe293b950 am: 02e44...
authorChristopher Tate <ctate@google.com>
Tue, 6 Dec 2016 00:28:19 +0000 (00:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 6 Dec 2016 00:28:19 +0000 (00:28 +0000)
am: 9d5dd3f584

Change-Id: Ic7effb22aa05c626d007aef30ab572363197cad3


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