tree 2dbb05e45f4a5eea661a6eeacb03f28c85efb5db
parent 2a998cf48ef3d3d3dc372012d7c736482b713c2b
parent dda5715811ca0904359219b547eae270dc06b224
author Baligh Uddin <baligh@google.com> 1404238489 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404238489 +0000

am 4e068180: (-s ours) Import translations. DO NOT MERGE

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