OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 84e2169 5ac716c)
am 5ac716cc: (-s ours) am e3a25165: (-s ours) am 9e63f233: (-s ours) Merge "Import...
authorGeoff Mendal <mendal@google.com>
Mon, 1 Jun 2015 17:25:58 +0000 (17:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 17:25:58 +0000 (17:25 +0000)
* commit '5ac716cc686d4cfa230a155218f51344434c9a41':
  Import translations. DO NOT MERGE


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