tree 8c32d2bfbfc0e40af820894b48b5e1fa06dc93f7
parent b7c280af9a2908ce849de281e92d31ff4f8d1cd6
parent d32e9b7ffb9e7657c510f69cc2c770bd8986c95c
author Baligh Uddin <baligh@google.com> 1381504276 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381504276 -0700

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

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