tree 2ecd5ddffa1f5929b2d7c3037b57669cfc158c82
parent 3ab2ee79232cbde7f23021742202ef32b2b2918e
parent d820f2943126c7155e164436a1f059f426cfc935
author Baligh Uddin <baligh@google.com> 1380139546 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380139546 -0700

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

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