tree 8d51a048d6b6140c76699c12440c98e28b6b801b
parent 038ecee9e10d12c43d778f81b0bc51b3c8643bab
parent f00ca818761b00f1722737f6115ecc7b75ce146e
author Baligh Uddin <baligh@google.com> 1380840010 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380840010 -0700

am f00ca818: (-s ours) am 0ac27a82: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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