tree 1b83e46737594736e443069d4160018b2cfec74d
parent fc9c8f74a8b315a904a5f7463fc2922e3bb0218b
parent ea8ec3cd1ef216ba6f1300b6cac57432a3761eeb
author Baligh Uddin <baligh@google.com> 1395341511 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395341511 +0000

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

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