tree 8d2afcce65ae10764f5f7fdb7087ffcb0fb2d962
parent bf5c3664a24cac5db9bbe9e2ab4dea44b434e1c5
parent 151eca643f86f0da2477d1611cdb5ae4eaf30ce6
author Baligh Uddin <baligh@google.com> 1354228939 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354228939 -0800

am 151eca64: am 7422f735: am 7c1000f6: Import translations. DO NOT MERGE

* commit '151eca643f86f0da2477d1611cdb5ae4eaf30ce6':
  Import translations. DO NOT MERGE