tree 5d5b693168d03f4623e71b6d0044394155c245fa
parent f94c0b2b412d741091674c3cd65cf9e2f54f4f77
parent 240692fbb3a579cabeacddea87b09d8d254dbeda
author Baligh Uddin <baligh@google.com> 1354253120 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354253120 -0800

am 240692fb: (-s ours) Import translations. DO NOT MERGE

* commit '240692fbb3a579cabeacddea87b09d8d254dbeda':
  Import translations. DO NOT MERGE