OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8b3152c c4ca931)
Merge "resolve merge conflicts of 1fae62661258 to oc-mr1-dev-plus-aosp" into oc-mr1...
authorAndreas Gampe <agampe@google.com>
Wed, 25 Oct 2017 05:37:12 +0000 (05:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 25 Oct 2017 05:37:12 +0000 (05:37 +0000)
am: c4ca931dc5

Change-Id: I6c42eb5cb874dc359cc8b9c3e01244182197faf3


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