| commit | 7a56a69a3f8ba774d3e276ad26a14d020d516073 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Nov 07 16:28:26 2011 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 07 16:28:26 2011 +0000 |
| tree | 17482eaf257fe07bf909a9726ae86f56b4037d48 | |
| parent | 45b92707d851458c73e320d2450cfc246b1167db [diff] | |
| parent | 197388e5f42fc21175a03e3abb05020fabbcbb71 [diff] |
am 064975c2: Reconcile with ics-mr0-release ics-factoryrom-2-release * commit '064975c27cbca412e682fa152ce00af14027ab4f': Fix a leak in Parcel::writeBlob. DO NOT MERGE Poll input data with a small timeout and don't consume a full core.