OSDN Git Service

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


Trivial merge