OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
94b5181
8e80d1f
)
am 8e80d1f9: am 33021d95: Merge "Adding timeout if the current printer or its capabil...
author
Svetoslav
<svetoslavganov@google.com>
Fri, 11 Oct 2013 21:36:56 +0000
(14:36 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 11 Oct 2013 21:36:56 +0000
(14:36 -0700)
* commit '
8e80d1f953932ad867ff4f0b23b466565f1b15f0
':
Adding timeout if the current printer or its capabilities disappear.
Trivial merge