OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 684675f f2bef9c)
am f2bef9cd: (-s ours) am 1d593ad4: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Tue, 7 Oct 2014 00:39:51 +0000 (00:39 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Oct 2014 00:39:51 +0000 (00:39 +0000)
* commit 'f2bef9cd1936c5d26d88c17b56746361af6e78f3':
  Import translations. DO NOT MERGE


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