OSDN Git Service

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

Change-Id: I3b5384931b09040dfb160359d62735db3c95042f


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