OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 66f0026 e00f63e)
Merge changes from topic "am-1138e40322094c4891e839a98a173b89"
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>
Fri, 26 Jan 2018 00:54:12 +0000 (00:54 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 26 Jan 2018 00:54:12 +0000 (00:54 +0000)
* changes:
  Merge changes from topic "am-d53588def0a94e089fd73c9ebe97efe7" into oc-mr1-dev-plus-aosp am: 63cfac44f0
  [automerger skipped] Import translations. DO NOT MERGE skipped: 39a33e2ffb skipped: 2e4c69a707 am: d7b199be9a  -s ours am: 4dfc160224  -s ours am: 4685af2a89  -s ours am: 2489d286fd  -s ours


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