tree 6ddb93977dada907615f0a41934c5437af030c27
parent 0216f546d13c00c5c380c812424dd7de026ef807
parent 316f5ae840f88690c59df8f9d0d5c797adc6ee68
author Baligh Uddin <baligh@google.com> 1353107190 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1353107190 -0800

am c6e93291: (-s ours) Import translations. DO NOT MERGE

* commit 'c6e93291c33c3aeb6d9a71bf5ce3033eb980a0f4':
  Import translations. DO NOT MERGE