tree 0b9f9ede59440f2f414ff826b8852d504f098a12
parent 6d02522461542f65c18725f3f2c6f24dcb801719
parent 03c79df9f3dca05f767493b4ffbcabb1eab44434
author Baligh Uddin <baligh@google.com> 1404682963 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404682963 +0000

am 03c79df9: (-s ours) am f70d0619: (-s ours) am e0bc7603: (-s ours) Import translations. DO NOT MERGE

* commit '03c79df9f3dca05f767493b4ffbcabb1eab44434':
  Import translations. DO NOT MERGE