tree aaf1e2f14155edba801b887864e069942139c0a8
parent ff080f4fa092c6cf690936fe2f4bb8c44d6242c5
parent ee84a4473c255dd5387afe1023b1e2d986a4089d
author Baligh Uddin <baligh@google.com> 1442686667 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442686667 +0000

am ee84a447: (-s ours) am e0388a40: (-s ours) am 892e8ade: (-s ours) am b519ad46: (-s ours) Import translations. DO NOT MERGE

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