tree 7e8521305a813927567ec65b2ce70a444c2a7e21
parent 4ad5e888d4fb983dedb2712361e53564a4820b66
parent e74a4c7cdc60c7690c6894ce26c6d3b8a737ac08
author Baligh Uddin <baligh@google.com> 1380918831 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380918831 -0700

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

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