tree b3df23fe7b172502c130939898a8d9616d2f34b3
parent 700eff5cbe5ead35f061a5ee7cda85fe315cc958
parent 5fb61d30681317beb559ba1bc5852ae0a8f1f427
author Baligh Uddin <baligh@google.com> 1349413467 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349413467 -0700

am 5fb61d30: am 04371308: Import translations. DO NOT MERGE

* commit '5fb61d30681317beb559ba1bc5852ae0a8f1f427':
  Import translations. DO NOT MERGE