OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0d0167e 72f1824)
Merge "resolve merge conflicts of f8187f4e1 to oc-dr1-dev-plus-aosp" into oc-dr1...
authorIan Elliott <ianelliott@google.com>
Tue, 18 Jul 2017 21:48:11 +0000 (21:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 21:48:11 +0000 (21:48 +0000)
am: 72f1824c46  -s ours

Change-Id: Id0de85cb32bfc7d90cf048639c4d3a6a21d63a54


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