tree f493ecb58c9339bf5b330085e116bf889c2967d8
parent 4a46cabaf51a3e4369c808aa3241eedf6844ed92
parent 37f3823699812908485a4d9a63828e6c09276bf1
author Baligh Uddin <baligh@google.com> 1381973314 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381973314 -0700

am 37f38236: (-s ours) Import translations. DO NOT MERGE

* commit '37f3823699812908485a4d9a63828e6c09276bf1':
  Import translations. DO NOT MERGE