tree f59f0423c25b488f2af7b74d368a5894894e9fd8
parent 5733dcce9b93fcf52fcfa0d27f559c3b25eb1bc7
parent 079a21c927b3d10284658e4f4fb93ab71eb727f3
author Baligh Uddin <baligh@google.com> 1350065424 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350065424 -0700

am 43b6cf3a: (-s ours) Import translations. DO NOT MERGE

* commit '43b6cf3abce288ee5f26ebe4a904e0ef2b5041c6':
  Import translations. DO NOT MERGE