tree cc82e3c2522e0f96faed36e708891e8fc495ce8e
parent c95e84a7c13d57f1d74aea03b8075ae42c8c015f
parent d35644e4f80a479659fd734db866a95c247496e3
author Baligh Uddin <baligh@google.com> 1383695397 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383695397 -0800

am d35644e4: (-s ours) am 15ecba0f: (-s ours) Import translations. DO NOT MERGE

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