tree 9e12c4068865079e45f3026e293bbdb17180ca9e
parent 7a06045562512f78e050ba7b01f8422b98c7db85
parent 5fbf5614416236718955a3c57511fe61c6b85faf
author Baligh Uddin <baligh@google.com> 1379220411 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379220411 -0700

am 5fbf5614: (-s ours) Import translations. DO NOT MERGE

* commit '5fbf5614416236718955a3c57511fe61c6b85faf':
  Import translations. DO NOT MERGE