OSDN Git Service

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

Change-Id: I84e59e27d3a92d3df1d901cfc57e5066c0e94139


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