tree c7b4706537ebad46b03c119e19fbccddbb21b53f
parent ac96f9cfc721ca328fb9f2c4fdecca42b0fa562b
parent d2d5e795ecfa064fa059c55210fd0d7a576b4604
author Baligh Uddin <baligh@google.com> 1389116884 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389116884 +0000

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

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