OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b3ce6d3 59f44d3)
resolve merge conflicts of 2ff6320d773c to oc-dr1-dev
authorRubin Xu <rubinxu@google.com>
Mon, 4 Dec 2017 17:07:19 +0000 (17:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 4 Dec 2017 17:07:19 +0000 (17:07 +0000)
am: 59f44d34c6

Change-Id: I7afc27da73c5a54537fcd8f49128752e00a954ea


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