tree ae95009e8cc935c2150eeb65b04ed71e5c2707e8
parent da34482dfc879e741f1ab2f64a0c1741640186da
parent f104f676e375c5c53eb049705740ab592b914bda
author Baligh Uddin <baligh@google.com> 1397662262 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397662262 +0000

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

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