tree d9e125703ce9dffdf29049b57c8ec96698a27b97
parent 128537f600e14c941656e648205987083f4096c3
parent 0298ebb2db5b7c24d68fd3817b11e2f887471d0c
author Svetoslav <svetoslavganov@google.com> 1382998545 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382998545 -0700

am 0298ebb2: am 60fb1e28: am 714ba345: Merge "Complete implementation of the advanced print options." into klp-dev

* commit '0298ebb2db5b7c24d68fd3817b11e2f887471d0c':
  Complete implementation of the advanced print options.