tree a85077c89413f9b1d8d6a0b427b0aa388bc83581
parent aa61fd71e169d64cfd243af49694b6fdb0a8e28d
parent 0b4a8442bf5c9931a159e220849b1d2cc92d578c
author Baligh Uddin <baligh@google.com> 1383320061 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1383320061 -0700

am 0b4a8442: (-s ours) am 91c7f77d: (-s ours) am 29cff2d2: (-s ours) Import translations. DO NOT MERGE

* commit '0b4a8442bf5c9931a159e220849b1d2cc92d578c':
  Import translations. DO NOT MERGE