tree 7a3d1e3c7423337cf311c0f3c25ac42b3847d3f8
parent c60170b96f6020f0bb501b57bd5890fbc7079ad3
parent d6c7fd28d0295dca2ed0bc92301a059a57386bd4
author Baligh Uddin <baligh@google.com> 1408728453 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408728453 +0000

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

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