tree ca406d06f5ecb8ab0a0af4c6442ec19aec0ac60b
parent bf09ef4eb9ecc0cd8442ed6b660d1a7cdde2a8d5
parent 5e030426a50bde016ba55a3f30c20cbfc19799bc
author Baligh Uddin <baligh@google.com> 1348817886 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348817886 -0700

am 5e030426: (-s ours) Import translations. DO NOT MERGE

* commit '5e030426a50bde016ba55a3f30c20cbfc19799bc':
  Import translations. DO NOT MERGE