OSDN Git Service

am 328483aa: (-s ours) am 36d2656f: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 19 Nov 2014 19:32:17 +0000 (19:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 19 Nov 2014 19:32:17 +0000 (19:32 +0000)
commitd15068d15a2acdbcc25900f1684eb8b48a996627
tree3de9a415564e68f5ea809deb7e4737f9e6158fce
parentfbf9642bee2e0aaa24770c282e21be674cb4b5b5
parent328483aa1bd64ec1275dc543f8e67f868e3f6122
am 328483aa: (-s ours) am 36d2656f: (-s ours) Import translations. DO NOT MERGE

* commit '328483aa1bd64ec1275dc543f8e67f868e3f6122':
  Import translations. DO NOT MERGE