OSDN Git Service

am 6482273e: (-s ours) am 4ebb0071: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 8 Oct 2014 18:32:22 +0000 (18:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 8 Oct 2014 18:32:22 +0000 (18:32 +0000)
* commit '6482273e836a7a6de5f8d05562ddc1afc2bfa828':
  Import translations. DO NOT MERGE


Trivial merge