tree 4f17d9329b6dccf2976cd81880c5fed07819af43
parent 6c983895cd42b71ddb43756f92be7420024ba908
parent 588975f099320713b6b4c5dabc7f958f98058ca6
author Baligh Uddin <baligh@google.com> 1392411191 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411191 +0000

am 588975f0: (-s ours) am 8eb857fa: (-s ours) am 458a15f7: (-s ours) am 89fbe00d: (-s ours) am 0491f0f1: (-s ours) Import translations. DO NOT MERGE

* commit '588975f099320713b6b4c5dabc7f958f98058ca6':
  Import translations. DO NOT MERGE