OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: be2b9e2 40d8943)
resolve merge conflicts of 03e80b462 to oc-dev-plus-aosp
authorSteven Moreland <smoreland@google.com>
Fri, 21 Apr 2017 01:03:31 +0000 (01:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 21 Apr 2017 01:03:31 +0000 (01:03 +0000)
am: 40d89431db

Change-Id: Iaa9b4f107451c4936025231b6eeb0d23454c1d36


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