tree e7739ae52375eba12c5d4706151692c1e16e9d95
parent c86f1a7fb3c34a77ea1313fe2d05113a4c7ac16b
parent 0b470dd9758d09d8adefc10a55b2ad3bc8fc022d
author Baligh Uddin <baligh@google.com> 1412095387 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412095387 +0000

am 0b470dd9: (-s ours) am 8ddabcd0: (-s ours) am 0b1acbb5: (-s ours) Import translations. DO NOT MERGE

* commit '0b470dd9758d09d8adefc10a55b2ad3bc8fc022d':
  Import translations. DO NOT MERGE