OSDN Git Service

am 35d2cf1c: (-s ours) am b4a027d0: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 7 Oct 2015 12:46:25 +0000 (12:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 7 Oct 2015 12:46:25 +0000 (12:46 +0000)
commitbd64cd59d6aace965dec9896a545572e16b456d6
tree7f40c5bf92c1bdba6ad67d2beb71759d77d4a152
parent3203791351e56e5ad0ead42c967fac0e154cbf7c
parent35d2cf1c0c75342b307fa90f1508741b10169c9f
am 35d2cf1c: (-s ours) am b4a027d0: (-s ours) Import translations. DO NOT MERGE

* commit '35d2cf1c0c75342b307fa90f1508741b10169c9f':
  Import translations. DO NOT MERGE