OSDN Git Service

am 34663b0f: (-s ours) am 36c35f23: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 15 Jul 2015 14:14:54 +0000 (14:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2015 14:14:54 +0000 (14:14 +0000)
* commit '34663b0fd4a21a6c107c6df313bcbd1548235fd5':
  Import translations. DO NOT MERGE


Trivial merge