OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a7a1038 c03ee73)
resolve merge conflicts of 07fe016 to nyc-dev am: 0f9a790e0f am: 19747cb135
authorAndrew Solovay <asolovay@google.com>
Thu, 28 Jul 2016 01:50:33 +0000 (01:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 28 Jul 2016 01:50:33 +0000 (01:50 +0000)
am: c03ee73ec2

Change-Id: Ife1195c5dba328b5bf31876364aa75008e5fcb31


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