tree f4c293dfda9ce3c56b57d4036c542b7c40ee02d6
parent adc92c1a9a592330fb9bef427332936a31d38b64
parent 445c9930e66173be767c358a3bbad290707e0c81
author Baligh Uddin <baligh@google.com> 1350448067 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350448067 -0700

am 445c9930: (-s ours) am c6d5cdc2: Import translations. DO NOT MERGE

* commit '445c9930e66173be767c358a3bbad290707e0c81':
  Import translations. DO NOT MERGE