OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a9403ac 619fa26)
resolve merge conflicts of 95e42d9 to nyc-dev-plus-aosp am: 289688de68
authorDavid Gross <dgross@google.com>
Thu, 21 Jul 2016 22:25:38 +0000 (22:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Jul 2016 22:25:38 +0000 (22:25 +0000)
am: 619fa2673f

Change-Id: Id9c94a0b2b3b0b89e297a7bc7dddc0b5a51aede5


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