tree cecf732288834cf4cae7f544c05ea15783a4ac85
parent bbeaf4717c592c2221b79ce07d843cf5dce8fc9d
parent fb0c640aaceb5aa7c154b2dc1e56b8d83528ddd4
author Baligh Uddin <baligh@google.com> 1388077882 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1388077882 -0800

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

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