OSDN Git Service

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

Change-Id: I66e7e982176555f09bf298325754d708ef0ecac0


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