tree 654cf7a5e2bdd359020114a653c26657b85f1e7c
parent 1df9bc5c1d47a09b08d49287d81832e18674bece
parent 0a4bd7c90c836a8d3d857753c72d83b35cefa5f3
author Baligh Uddin <baligh@google.com> 1395774556 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395774556 +0000

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

* commit '0a4bd7c90c836a8d3d857753c72d83b35cefa5f3':
  Import translations. DO NOT MERGE