OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d68ab1f 78578a1)
[automerger skipped] Import translations. DO NOT MERGE skipped: 9a738cccdb skipped...
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>
Thu, 25 Jan 2018 21:50:53 +0000 (21:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Jan 2018 21:50:53 +0000 (21:50 +0000)
am: 78578a1294  -s ours

Change-Id: I39d1e16f34fea09009c039a955040e811988d422


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