tree db35656d6647ad8866ef058d32a8b681a4c07d6b
parent 212e7034f9302cbd0f4c5f4481dba7c257465a9d
parent f242aee47f155a8fd7b4d42c081d7d1e44194c43
author Baligh Uddin <baligh@google.com> 1410881529 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410881529 +0000

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

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