tree 915a1df70197f122c5fcfce34097dd39490ed401
parent e0628134ab8c5f997d43cc6d8ed79fdea5e815f6
parent ab0c43a4581d5b34ea9590cad4495447aa536942
author Baligh Uddin <baligh@google.com> 1396622243 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396622243 +0000

am ab0c43a4: (-s ours) am 15fdce9d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

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