OSDN Git Service

am c493f042: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Tue, 4 Aug 2015 03:09:17 +0000 (03:09 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 4 Aug 2015 03:09:17 +0000 (03:09 +0000)
* commit 'c493f0421773fba528494d98e396c34f6815fe7b':
  Import translations. DO NOT MERGE


Trivial merge