| commit | d3011ec5d392996849dd1a62c42832155f46acf2 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Nov 07 17:37:20 2011 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 07 17:37:20 2011 +0000 |
| tree | 628b10ab6b9ce081616021cea2cc990d6986d400 | |
| parent | ff7eb864cdef857b076f2427c58ee58e59e75994 [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.