tree d480a9df18213d791f716ded764bcd22e74dbd2d
parent 6e9c3763b87cb8b8c2f5523f7b8037bf46387dcd
parent 1bc53e6339c86602df12b8c14d82b51792712904
author Baligh Uddin <baligh@google.com> 1395961829 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395961829 +0000

am 1bc53e63: (-s ours) am e7a64624: (-s ours) am adff3f1f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '1bc53e6339c86602df12b8c14d82b51792712904':
  Import translations. DO NOT MERGE