OSDN Git Service

am 32b5a7ee: (-s ours) Merge "DO NOT MERGE Poll input data with a small timeout and...
authorDave Burke <daveburke@google.com>
Fri, 4 Nov 2011 11:59:27 +0000 (11:59 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 Nov 2011 11:59:27 +0000 (11:59 +0000)
* commit '32b5a7eeaf758fad0c24131603cdd54cd2883a58':
  DO NOT MERGE Poll input data with a small timeout and don't consume a full core.


Trivial merge