OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 46a38a7 5340d7d)
Merge "DO NOT MERGE ANYWHERE" into nyc-mr1-dev am: ba0ee69a15 -s ours
authorBen Lin <linben@google.com>
Thu, 22 Sep 2016 02:54:23 +0000 (02:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Sep 2016 02:54:23 +0000 (02:54 +0000)
am: 5340d7d849  -s ours

Change-Id: I653293d3e43fff57b4ddd651d01b10e46be6160c


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