OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c749e15 134e4b2)
[automerger skipped] resolve merge conflicts of aad998c0b4b97190754e72548960cf72b967d...
authorDan Sandler <dsandler@android.com>
Thu, 18 Oct 2018 14:11:29 +0000 (07:11 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 18 Oct 2018 14:11:29 +0000 (07:11 -0700)
am: 134e4b284b  -s ours

Change-Id: Ib01f7765aed17d06fd8aa09fee071b0cefa1128f


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