tree ff1c31a5c0c461e8583f3dc5df329d004d0c7ba5
parent 080e9f443c6cab7b690be39d7e59c86f0fbd3eec
parent ba90b2555af62b4cad68b944a5f57fd14a31d6ae
author Baligh Uddin <baligh@google.com> 1366833130 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366833130 -0700

am ba90b255: am 0f3a20d9: Import translations. DO NOT MERGE

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