tree f08ac307e4a4813b4ba4293aa3b90ad33e86937c
parent e1f91416c5cf20afac6a4a4d7712130e65462b3b
parent 4dd5a5d90c2819cec8b7028ea129cbbeff848c80
author Baligh Uddin <baligh@google.com> 1349145532 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349145532 -0700

am 4dd5a5d9: (-s ours) am a6ce58d5: am 70021c39: Import translations. DO NOT MERGE

* commit '4dd5a5d90c2819cec8b7028ea129cbbeff848c80':
  Import translations. DO NOT MERGE