tree 4f768055cd7b484f8cf17c6bf881ea7afc485cbf
parent 0b89c524520cb057b39340c413fff522d1765a82
parent 45d0eafb35cc3a78600cf89f77a26720806f0819
author Baligh Uddin <baligh@google.com> 1355190038 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1355190038 -0800

am 45d0eafb: (-s ours) am b21d4e93: am 45f73b86: Import translations. DO NOT MERGE

* commit '45d0eafb35cc3a78600cf89f77a26720806f0819':
  Import translations. DO NOT MERGE