OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dad1aa3 530a622)
Merge "Merge "Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6" am: 6fd067...
authorAdam Lesinski <adamlesinski@google.com>
Wed, 5 Jul 2017 21:27:49 +0000 (21:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Jul 2017 21:27:49 +0000 (21:27 +0000)
am: 530a622f60  -s ours

Change-Id: I0bf2d7461e65989758cb0575c1b1cb6ae238dd9f


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