tree bde4db766b585687234e96d027c8b0274b57a841
parent 25fe41b8e0a0e7e80bcc533b5087d63767faa689
parent b9c1e5a82947e13a10b407a1d4f81967c9af99b4
author Baligh Uddin <baligh@google.com> 1400728271 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400728271 +0000

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

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