tree 5fcb94764c3e99acdc2f28f945a400e1d4660af8
parent c88eba105950ec2eea5b6cd420047684659d1837
parent 8713e74c71cbfdf9e62f4b6c496496a6207e33ce
author Baligh Uddin <baligh@google.com> 1352153713 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352153713 -0800

am 8713e74c: am c36184a8: Import translations. DO NOT MERGE

* commit '8713e74c71cbfdf9e62f4b6c496496a6207e33ce':
  Import translations. DO NOT MERGE