OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ad7ef77 c334ca1)
Merge \\"resolve merge conflicts of 4931fb2 to nyc-mr1-dev-plus-aosp\\" into nyc...
authorCraig Donner <cdonner@google.com>
Tue, 14 Jun 2016 04:04:07 +0000 (04:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 14 Jun 2016 04:04:07 +0000 (04:04 +0000)
am: c334ca140d

Change-Id: I5326d3444cc47bc1476f53f5a184351b9652cfa0


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