OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d1c8630
d40e8d7
)
am dc858596: am 43e72b1f: (-s ours) am 32b5a7ee: (-s ours) Merge "DO NOT MERGE Poll...
author
Dave Burke
<daveburke@google.com>
Fri, 4 Nov 2011 12:06:15 +0000
(12:06 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 4 Nov 2011 12:06:15 +0000
(12:06 +0000)
* commit '
dc858596b2d557a8681b973b8092c16f4933d353
':
DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
Trivial merge