| commit | 8cc7a9d21f14aa5819544e94b113cfc311e8178d | [log] [tgz] |
|---|---|---|
| author | Svetoslav Ganov <svetoslavganov@google.com> | Thu Dec 05 22:51:10 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 05 22:51:10 2013 +0000 |
| tree | adb64c650885008a1b21eaedbeb3b9fc778f44aa | |
| parent | 2b89bfbb2629b5c00d005cbcd16a85bda44fff07 [diff] | |
| parent | 335289aae79b5dc759629a89b97bf059a3d1e466 [diff] |
am 335289aa: (-s ours) am 51843f8a: am 371c46fe: Merge "Remove exceptions from the printer discovery session APIs." into klp-dev * commit '335289aae79b5dc759629a89b97bf059a3d1e466':