OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5d06597 1238ffc)
resolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624 am: 8f4f9e4d5e am: a2156...
authorNarayan Kamath <narayan@google.com>
Thu, 25 Aug 2016 23:35:41 +0000 (23:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Aug 2016 23:35:41 +0000 (23:35 +0000)
am: 1238ffcd2c

Change-Id: I4fa223dc0d1e1beeb6d9a8a7dfd1181efe473a90


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