OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2c18f32 c18b88c)
resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am...
authorSudheer Shanka <sudheersai@google.com>
Fri, 26 Aug 2016 00:06:01 +0000 (00:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 Aug 2016 00:06:01 +0000 (00:06 +0000)
am: c18b88c15d

Change-Id: I67b766b5c658101cffc4ef53db67685709aec072


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