tree 2355fe6d7aa5123375bddaea8f5b3b93ccb83814
parent 8afff945027a4aad74077af96bd001326f04e569
parent e00fd06fdedaadbac2d4f9dd71831d9c24e3fbed
author Baligh Uddin <baligh@google.com> 1442631874 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442631874 +0000

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

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