OSDN Git Service

am 0462d5b1: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 13 Jul 2015 23:00:22 +0000 (23:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 13 Jul 2015 23:00:22 +0000 (23:00 +0000)
* commit '0462d5b16c7e6c00ecc6bf74df57fca7ba5a3c19':
  Import translations. DO NOT MERGE


Trivial merge