tree 6ef9288529172208fe7d9319607b7808347f89be
parent 03b87fa5540a2812a37ffd2cbb2bbc8fd6a4e8b1
parent 460c4b284c0c2b956745b24e512c7e9b77c5fb97
author Baligh Uddin <baligh@google.com> 1411322444 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411322444 +0000

am f533e2b5: (-s ours) am 194b865c: (-s ours) Import translations. DO NOT MERGE

* commit 'f533e2b5fb77353e56a25852ba410ed044c5cad7':
  Import translations. DO NOT MERGE