tree dda308a5457480cb631020220850521645f1399e
parent 3e6b26daba924fb88e20855210e0a96e2ab0ac37
parent f42cf7de53f9f500ae06b62b9097b9edc7884a2b
author Baligh Uddin <baligh@google.com> 1392930528 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1392930528 -0800

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

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