tree fec384274f890ab843014ed11a72e4812c47b894
parent bd6df7313f8869a8e7abfd0406f30716c2bab7ae
parent c3508b347ded0967e6ffc09a5c4bd7e479df9aaf
author Baligh Uddin <baligh@google.com> 1363809952 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1363809952 +0000

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

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