tree e5c4846d144fd9835dfc69fdb42d20f858d34e54
parent 2c172631fba13a25cd95c35e24f02597f7ec6750
parent 74d2561a75b1e0833fdd0d730fd5ba215261b443
author Baligh Uddin <baligh@google.com> 1380913364 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380913364 -0700

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

* commit '74d2561a75b1e0833fdd0d730fd5ba215261b443':
  Import translations. DO NOT MERGE