tree 1665087a191f5aed6dcb4110b8b9bb48ec5854ed
parent 3a9a2089852d18ef7abbb9476fc3455bfec5a880
parent 2bc2574e60b5050107c28e4bc4f1fd505467c9d6
author Baligh Uddin <baligh@google.com> 1383316629 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1383316629 -0700

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

* commit '2bc2574e60b5050107c28e4bc4f1fd505467c9d6':
  Import translations. DO NOT MERGE