OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9897cc4 82c46d1)
resolve merge conflicts of e091985bb5b5 to stage-aosp-master
authorJack Yu <jackyu@google.com>
Sat, 25 Feb 2017 04:58:12 +0000 (04:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 25 Feb 2017 04:58:12 +0000 (04:58 +0000)
am: 82c46d11f6

Change-Id: I2b6b5f698d03c86957fdaf4f73e26dfe36758924


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