OSDN Git Service

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

Change-Id: I47bfb18ce300e52a092da534b8aac720f0b8aa3f


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