OSDN Git Service

am c0fa470d: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 20 Jul 2015 14:32:42 +0000 (14:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 20 Jul 2015 14:32:42 +0000 (14:32 +0000)
commit7b2319d016ecc32ca42819a0f6caa62a9681d137
tree3d8c3ec50c3010b51098ae7d2d8c4cddc2f1e4cb
parentec69003d9b7e22f57b6168796fd5510f26b32986
parentc0fa470da08460dc749e24107c904f47e3ee0d94
am c0fa470d: (-s ours) Import translations. DO NOT MERGE

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