diff options
| author | Dave Burke <daveburke@google.com> | 2011-11-04 12:04:08 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-04 12:04:08 +0000 |
| commit | 28bb5bd7b8ecba7f278d2cadd21bdd1286eea655 (patch) | |
| tree | 88193780bffad233d9cb7237a83bda250c364c11 /media | |
| parent | 0bdcaf9c5466cf9c84a8c98e160411ab74f05f4b (diff) | |
| parent | 654d83b36af586919457880e40a5dfdd79a31abb (diff) | |
| download | frameworks_av-28bb5bd7b8ecba7f278d2cadd21bdd1286eea655.zip frameworks_av-28bb5bd7b8ecba7f278d2cadd21bdd1286eea655.tar.gz frameworks_av-28bb5bd7b8ecba7f278d2cadd21bdd1286eea655.tar.bz2 | |
am 43e72b1f: (-s ours) 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.
Diffstat (limited to 'media')
0 files changed, 0 insertions, 0 deletions