tree 983fbe31b3cf7ffda47cd03ce4d9fce17d1c56ac
parent cfa2eca503227c54c054d776cdc040f5b442791e
parent 59f97c4d8fcb2a901dacf131699b24700eff0532
author Baligh Uddin <baligh@google.com> 1383796744 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383796744 -0800

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

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