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

am bf5c3664: (-s ours) am 3ba74d4b: am 582e13d1: Import translations. DO NOT MERGE

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