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)
* commit '35d2cf1c0c75342b307fa90f1508741b10169c9f':
  Import translations. DO NOT MERGE


Trivial merge