OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 58c4917 7bbe370)
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab am: e2c9b...
authorChristopher Tate <ctate@google.com>
Fri, 17 Jun 2016 21:35:16 +0000 (21:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 17 Jun 2016 21:35:16 +0000 (21:35 +0000)
am: 7bbe370365

Change-Id: I12a40bfdbb01fdde2c4a4613c339b7b001aef6c4


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