OSDN Git Service

am b5ad15ae: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 28 Jan 2015 15:33:32 +0000 (15:33 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 28 Jan 2015 15:33:32 +0000 (15:33 +0000)
* commit 'b5ad15ae2476eaf53694c3c87df45df7f7773198':
  Import translations. DO NOT MERGE


Trivial merge