tree c19d333d0665b2ade4ecfdf3e92f7bb48b69b010
parent c054b3aeb6d2d5c7fbdc1e745d4659ce37ef8e30
parent 8fb904cc2f916cea52439a19a0b71d5fef7d3964
author Baligh Uddin <baligh@google.com> 1393352704 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1393352704 +0000

am 8fb904cc: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-mister-ugly

* commit '8fb904cc2f916cea52439a19a0b71d5fef7d3964':
  Import translations. DO NOT MERGE