OSDN Git Service

am c9282823: (-s ours) am e4d510fa: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Mon, 13 Oct 2014 22:25:17 +0000 (22:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 13 Oct 2014 22:25:17 +0000 (22:25 +0000)
* commit 'c92828231993aa2c1a447c37a4a6f9740e950a72':
  Import translations. DO NOT MERGE


Trivial merge