OSDN Git Service

am b28a786f: (-s ours) am b5f2e79b: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 6 Oct 2014 16:18:58 +0000 (16:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 6 Oct 2014 16:18:58 +0000 (16:18 +0000)
* commit 'b28a786fe25e89416147cbb68c1ef72c3ea9cb5d':
  Import translations. DO NOT MERGE


Trivial merge