OSDN Git Service

am e111474b: (-s ours) am 26b04765: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 10 Dec 2014 22:22:34 +0000 (22:22 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 10 Dec 2014 22:22:34 +0000 (22:22 +0000)
commitd580efb9336d13feff1b1ab236ae2f026434c386
tree2fb6983bbc235ff1cbc1b2bb5480d24b44d0a2c3
parent4eaf999a540d31e1caacd5edf29b7e6ab75f6c11
parente111474b0fa936821b7fad36506dc8e91a85eb23
am e111474b: (-s ours) am 26b04765: (-s ours) Import translations. DO NOT MERGE

* commit 'e111474b0fa936821b7fad36506dc8e91a85eb23':
  Import translations. DO NOT MERGE