tree 43530d07ca7c3095dbf282328716c4663ab1fba5
parent 4f2ff756e169984abf955fc02e060b681d1f0f20
parent 840587b309d52d31f9b4f3dc6e709145a9c96d6d
author Baligh Uddin <baligh@google.com> 1384209674 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384209674 -0800

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

* commit '840587b309d52d31f9b4f3dc6e709145a9c96d6d':
  Import translations. DO NOT MERGE