OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6b0b1da e30c42e)
[automerger skipped] DO NOT MERGE ANYWHERE: resolve merge conflicts of 77c1f6080171bd...
authorSteve Elliott <steell@google.com>
Wed, 31 Oct 2018 22:07:29 +0000 (15:07 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 31 Oct 2018 22:07:29 +0000 (15:07 -0700)
am: e30c42e456  -s ours

Change-Id: I463ddbc2cf94f52d7b66d6dffb0b0c7233e8dfd3


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