OSDN Git Service

am 2fc3216e: (-s ours) am facfbc52: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 15 Jul 2015 17:08:46 +0000 (17:08 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2015 17:08:46 +0000 (17:08 +0000)
commit633a6c92af951c2cc410fda3ba5eaf5376949a7f
tree8190d84d3751c3ab471bf9c114be60939ac5d85d
parent09a86a23814854dc40e96637d99da25cace9f777
parent2fc3216e2f8b77116594ca5cda2e927c43094039
am 2fc3216e: (-s ours) am facfbc52: (-s ours) Import translations. DO NOT MERGE

* commit '2fc3216e2f8b77116594ca5cda2e927c43094039':
  Import translations. DO NOT MERGE