tree 1e95cb4b0b70723f78e7c8b75f5c707e2351a5d2
parent e0623768f64416a260684669e057ef4110314392
parent 978995ba740d320afe39643e334bcd347c90c4ee
author Baligh Uddin <baligh@google.com> 1387404513 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1387404513 +0000

am b5f89802: (-s ours) am 4740067a: (-s ours) am 06cc7f7f: (-s ours) Import translations. DO NOT MERGE

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