tree b49676e6f882ecc8f919f139aadb65a29997e4d9
parent a7c0b5634902cc08543a202f86a79632302d57e1
parent 6c96757f6f39c8c52a248da638e30d3f9b1f3cd5
author Baligh Uddin <baligh@google.com> 1350497361 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350497361 -0700

am 6c96757f: (-s ours) Import translations. DO NOT MERGE

* commit '6c96757f6f39c8c52a248da638e30d3f9b1f3cd5':
  Import translations. DO NOT MERGE