tree 25007d0680878d8a734b17778d88d133bbbeb7fd
parent b8e2f178e9f1bfc82f5ca7fda78b33e101f54dd1
parent c783f6738f0f6d2cb57702cfbc9219c59a3410a3
author Svetoslav Ganov <svetoslavganov@google.com> 1380575870 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380575870 -0700

am c783f673: Merge "Adding a timeout for waiting to get the selected printer\'s capabilities." into klp-dev

* commit 'c783f6738f0f6d2cb57702cfbc9219c59a3410a3':
  Adding a timeout for waiting to get the selected printer's capabilities.