OSDN Git Service

am f2e81836: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 17 Mar 2014 20:44:07 +0000 (20:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 17 Mar 2014 20:44:07 +0000 (20:44 +0000)
* commit 'f2e81836dc190f584d3e2c1764c7cb9bb9066bff':
  Import translations. DO NOT MERGE


Trivial merge