tree ee617577bd2bcabf8aaee3ec9262535843ce0fc1
parent ca71e07f0677fc5e13ee04450c3e3b82b752bd19
parent 9cd24101315392d6b58331a7969696ba873103f6
author Baligh Uddin <baligh@google.com> 1403801687 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403801687 +0000

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

* commit '9cd24101315392d6b58331a7969696ba873103f6':
  Import translations. DO NOT MERGE