tree 9a4a6b063bc0b6a651002094990f1169be4e89e2
parent 5848da6109446e9cc6534df8e955aec8eb85b7d4
parent f5cdc0cbfaa73c52cb6a3009b499180d86e078cc
author Baligh Uddin <baligh@google.com> 1442630941 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442630941 +0000

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

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