| commit | f47368b74d8d300bcd08cf148b609164245186a9 | [log] [tgz] |
|---|---|---|
| author | Dave Burke <daveburke@google.com> | Fri Nov 04 12:03:26 2011 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 04 12:03:26 2011 +0000 |
| tree | f52a8c4d2249de589004b292f80ef9ec1f10a849 | |
| parent | b518cf9d4456dc0ef58d67f09efe1db0e017852a [diff] | |
| parent | 654d83b36af586919457880e40a5dfdd79a31abb [diff] |
am 43e72b1f: am 32b5a7ee: (-s ours) Merge "DO NOT MERGE Poll input data with a small timeout and don\'t consume a full core." into ics-mr0 * commit '43e72b1f5692dd9e220158001317c2abc0ecafcf': DO NOT MERGE Poll input data with a small timeout and don't consume a full core.