OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dfc2d0a a0994c6)
resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am...
authorSudheer Shanka <sudheersai@google.com>
Wed, 24 Aug 2016 20:38:40 +0000 (20:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 24 Aug 2016 20:38:40 +0000 (20:38 +0000)
am: a0994c6d58

Change-Id: I50cb41c74c4d049390155fc0981f6609673febd0


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