OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 827dfe0 c14f46b)
Merge "resolve merge conflicts of 8f1d13300f73 to oc-dr1-dev" into oc-dr1-dev
authorJorim Jaggi <jjaggi@google.com>
Tue, 13 Jun 2017 00:29:15 +0000 (00:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Jun 2017 00:29:15 +0000 (00:29 +0000)
am: c14f46b135

Change-Id: Iaab3c2094a3f2e905097f47ed24276cc412d0b93


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