tree db35656d6647ad8866ef058d32a8b681a4c07d6b
parent 7a40e4392783bf2e3ee731ea9678e6a0ed764583
parent f02cea2e8aaac73e29d628e236640b5382f49b20
author Baligh Uddin <baligh@google.com> 1413764992 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413764992 +0000

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

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