tree e2c9da74e36d15f7f67098ce43b9509f12171d86
parent e9eb0c059e63bbb6a3b1dd61ed315921ba4edd8c
parent e8b67adf295eeb34920ba05da7e2e727f936f898
author Baligh Uddin <baligh@google.com> 1379002097 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379002097 -0700

am e8b67adf: (-s ours) Import translations. DO NOT MERGE

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