OSDN Git Service

am 9e218eaf: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 8 Jul 2015 19:12:29 +0000 (19:12 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 8 Jul 2015 19:12:29 +0000 (19:12 +0000)
* commit '9e218eaf2398e72619ab8dcd596ca99bfc85746b':
  Import translations. DO NOT MERGE


Trivial merge