OSDN Git Service

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


Trivial merge