tree bb732f9fde0b3817ca187d608d7a85b3df5600d4
parent 798de53cf454595a3a494d26dfa3f08518c24e55
parent ba52aff41b602a68cbe7baed1aeb1adf42f34139
author Baligh Uddin <baligh@google.com> 1352505041 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352505041 -0800

am ba52aff4: Import translations. DO NOT MERGE

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