tree ddbfc85ae17be0af0afa484e441fd0f6c1507e06
parent a9bec69a95e6c6a8629d76eab3d090e688f046e9
parent 24c2980cb2a9a93d1d6fe2a849f915b3819056c2
author Baligh Uddin <baligh@google.com> 1389055277 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389055277 +0000

am 24c2980c: (-s ours) am be24e41b: (-s ours) am 2c4d6d91: (-s ours) am fd8be467: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '24c2980cb2a9a93d1d6fe2a849f915b3819056c2':
  Import translations. DO NOT MERGE