OSDN Git Service

am f53cc1d7: (-s ours) am 0053802f: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 8 Jun 2015 17:04:16 +0000 (17:04 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 8 Jun 2015 17:04:16 +0000 (17:04 +0000)
commitfaad75fbfdae54d217f34cc0a176dbf8391d1f35
tree075f8e549c4e5f2be1a93e0a641e554bc218a8fc
parenta048b2c76a2af99a6504ddd24cdedd98d1348f78
parentf53cc1d7975295fa3a2fc584e5a051fbf659c948
am f53cc1d7: (-s ours) am 0053802f: (-s ours) Import translations. DO NOT MERGE

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