tree 8d2f5c22f54088be3981b01587ece4461009be94
parent cbf49aa54b2d6c87367deabca67e484e072e23a0
parent 6e9c3763b87cb8b8c2f5523f7b8037bf46387dcd
author Baligh Uddin <baligh@google.com> 1395959195 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395959195 +0000

am 6e9c3763: (-s ours) am 3e9fac90: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit '6e9c3763b87cb8b8c2f5523f7b8037bf46387dcd':
  Import translations. DO NOT MERGE