tree 16057dc851fe1c0a128c5a759c56c7121295cba4
parent b60c64f644e9c4eeaf42fd5c6fec5f8f9eed532b
parent b689f7068a4d4b63b6772f68beb507a4d0e4a5d0
author Baligh Uddin <baligh@google.com> 1408162771 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408162771 +0000

am a1defcbf: (-s ours) am 17a72ded: (-s ours) am fb3615a0: (-s ours) Import translations. DO NOT MERGE

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