tree 152f5735380438c6e46703b6fa33c400785c97fc
parent ab6318445380176b3a262281d98af22985e18500
parent e638cdad1e244b787c2bcb7a1eae49854d8fcf30
author Baligh Uddin <baligh@google.com> 1392981377 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392981377 +0000

am e638cdad: (-s ours) am 36c123ec: (-s ours) am 9594e887: (-s ours) am 37fe7d2b: (-s ours) am f42cf7de: (-s ours) Import translations. DO NOT MERGE

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