OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 29f0db6 f697bba)
resolve merge conflicts of 35ea9f8 to nyc-mr1-dev-plus-aosp
authorDan Willemsen <dwillemsen@google.com>
Sat, 6 Aug 2016 03:23:02 +0000 (03:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 6 Aug 2016 03:23:02 +0000 (03:23 +0000)
am: f697bba2d3  -s ours

Change-Id: I239c55903ba240bbd9728372236c0db214a2cfbb


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