tree ee617577bd2bcabf8aaee3ec9262535843ce0fc1
parent 1634e49edffc0517356d2a875f0226169c8a69b0
parent bbf69273a7ac6cc95a9b0682d0fe62f3a0afb35f
author Baligh Uddin <baligh@google.com> 1403801690 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403801690 +0000

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

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