OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 663d3d7 ff797c3)
[automerger skipped] resolve merge conflicts of 88c651eab144bf64acb1d99f11aabe983f236...
authorEvan Laird <evanlaird@google.com>
Wed, 20 Nov 2019 19:28:47 +0000 (11:28 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 20 Nov 2019 19:28:47 +0000 (11:28 -0800)
am: ff797c3ba3 -s ours
am skip reason: change_id I0680034ed9315aa2c05282524d48faaed066ebd0 with SHA1 3b8c4743f6 is in history

Change-Id: I4236581921e3572b932a95c37a69a062e90b9231


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