tree b54fdd94e906568e1346b24d240e2de99f85d319
parent ae7999c87862c5dea6bd69017b67b14807cdc074
parent d25f91b036a76a19dfd10dfe88318a61157b7b9e
author Baligh Uddin <baligh@google.com> 1391214568 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1391214568 -0800

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

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