OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e034a1f 0ddaa63)
Merge "resolve merge conflicts of 490d397d284f to oc-dr1-dev" into oc-dr1-dev
authorPhil Weaver <pweaver@google.com>
Wed, 30 Aug 2017 23:10:03 +0000 (23:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 30 Aug 2017 23:10:03 +0000 (23:10 +0000)
am: 0ddaa63b67  -s ours

Change-Id: Id403b03e837eafab80ed20271543e82cb74c260b


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