tree a85077c89413f9b1d8d6a0b427b0aa388bc83581
parent 33ce277a53ead81c2dc60b5923c8f8eb129e7e59
parent 29cff2d21aae2dbde622f99240cfe4d19fbc5e4a
author Baligh Uddin <baligh@google.com> 1383317626 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1383317626 -0700

am 29cff2d2: (-s ours) Import translations. DO NOT MERGE

* commit '29cff2d21aae2dbde622f99240cfe4d19fbc5e4a':
  Import translations. DO NOT MERGE