OSDN Git Service

am c4fd0715: (-s ours) am c3cd6d95: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Tue, 7 Oct 2014 00:40:12 +0000 (00:40 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Oct 2014 00:40:12 +0000 (00:40 +0000)
* commit 'c4fd0715c06b8197ff6f47da5d55f58cc4b336f6':
  Import translations. DO NOT MERGE


Trivial merge