tree 2f08df22f31e3a6cac5d01c0c56244f65e422e21
parent 1c307b4ff67016e30a9951cf4de95283847bb7dd
parent d005a4d49a58e1324abdff46a18d15a563b938fb
author Baligh Uddin <baligh@google.com> 1442597066 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442597066 +0000

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

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