OSDN Git Service

am 1992d5a1: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 20 Jul 2015 22:55:16 +0000 (22:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 20 Jul 2015 22:55:16 +0000 (22:55 +0000)
* commit '1992d5a1fc616f5132315ee6d4659c20728acad6':
  Import translations. DO NOT MERGE


Trivial merge