commit fd1d05a01a704db47f6e60425c0ac3e1bd4cffbf
Author: Jeff Brown <jeffbrown@google.com>
Date:   Fri Nov 11 15:03:05 2011 -0800

    Fix bug in TextLayoutCacheKey handling embedded nulls.

    We were not passing the length of the UTF-16 string to
    String16::setTo.  As a result, it was copying the contents of
    the text up to the first null it found.

    First problem, these strings are not typically null terminated!

    Second problem, if the string contained a null character, then
    we might truncate it.  However, we only truncated the string
    when the copy constructor was invoked (say, when we called
    get() on the cache) but not in internalTextCopy() (before
    adding the key to the cache).

    As a result of the second problem, we would first search
    the cache for a key that matched a partially copied truncated
    string (potentially reading uninitialized memory that followed it).
    Finding none, we would add the entry to the cache using
    the correct key.

    If the cache already had a value associated with the correct key,
    then the put would fail, returning false.  Charging ever onwards,
    we would add the size of the entry to the cache size.

    Proceeding in this manner, it was possible for the cache to
    believe it had less remaining space than it really did.  At that
    point, it was possible for the cache to evict all entries and
    yet still not think it had room to add a new one, so it would
    continue trying to make space indefinitely.

    Bug: 5576812
    Change-Id: I05251594f6b2da0a5dc09f7200f04fe9100ec766

commit 829a6f208cbdcc9eecaa59d086b27b413e3227ee
Author: Jeff Brown <jeffbrown@google.com>
Date:   Fri Nov 4 19:01:44 2011 -0700

    Fix a leak in Parcel::writeBlob.

    Was mistakenly assuming that Parcel::writeFileDescriptor took
    ownership of the fd that was passed in.  It does not!
    Added some comments and a default parameter to allow the caller
    to specify whether it wishes the Parcel to take ownership.

    Bug: 5563374
    Change-Id: I5a12f51d582bf246ce90133cce7690bb9bca93f6

commit 6d25e3400cee4ca6965a9fd22222a8389c08380c
Author: Andreas Huber <andih@google.com>
Date:   Thu Nov 3 11:00:21 2011 -0700

    DO NOT MERGE Poll input data with a small timeout and don't consume a full core.

    Change-Id: I3c288698920fe6ead0df24a52330483609821a41
    related-to-bug: 5549263

commit 287c1e66feaf6cee7c0789d7f82940d3856eafc2
Author: The Android Automerger <android-build@android.com>
Date:   Wed Nov 2 21:08:38 2011 -0700

    Revert "Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0"

    This reverts commit 7f00c22b7fa7b38b644585c0a3c6faadc5def94c, reversing
    changes made to 451fa13e82ea1226895b41282fdb33bf9fea5d19.

commit b6b117624b460fec104be94977ed64d190473182
Author: The Android Automerger <android-build@android.com>
Date:   Wed Nov 2 21:04:32 2011 -0700

    Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0"

    This reverts commit f0ad147fc33cf55cd9427010b2cdb3eb89b9eec3, reversing
    changes made to bd9b1528051a1b257768fdbc5077a2d4473b02dd.

commit f17756f8e60ba192d1c222d9d180b41fdbdbec32
Author: The Android Automerger <android-build@android.com>
Date:   Wed Nov 2 20:59:04 2011 -0700

    Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0"

    This reverts commit 4b6353ea0265bfed52d0637abd1b17596ce25ff0, reversing
    changes made to af675222f6340a8a9edbe9e8635014a18521e5e0.

commit 54b212c75e17ffb963b1266c31f1908a1a70ca71
Author: The Android Automerger <android-build@android.com>
Date:   Wed Nov 2 20:58:26 2011 -0700

    Revert "Merge "Fix potential segfault in RS watchdog." into ics-mr0"

    This reverts commit af675222f6340a8a9edbe9e8635014a18521e5e0, reversing
    changes made to 6e91e5b689a3eb8e6a6f3c038322b8044a9d6670.

commit 50b193c82d0458a1c225f3042f84618fe3408482
Author: The Android Automerger <android-build@android.com>
Date:   Wed Nov 2 20:58:00 2011 -0700

    Revert "Merge "Improve the slow query instrumentation." into ics-mr0"

    This reverts commit 2d280f754e32e556407df05d977cfabdfff1c070, reversing
    changes made to 2cc1c5d067736f221554be593c2ba2c96390f847.

commit beb470af433368bb423c0efd57de77c0a933e7bd
Author: The Android Automerger <android-build@android.com>
Date:   Wed Nov 2 10:18:09 2011 -0700

    Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0"

    This reverts commit f0ad147fc33cf55cd9427010b2cdb3eb89b9eec3, reversing
    changes made to bd9b1528051a1b257768fdbc5077a2d4473b02dd.

commit 8e31988d264785f05b97606a09d2d65de0d59904
Author: The Android Automerger <android-build@android.com>
Date:   Wed Nov 2 10:14:18 2011 -0700

    Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0"

    This reverts commit 4b6353ea0265bfed52d0637abd1b17596ce25ff0, reversing
    changes made to af675222f6340a8a9edbe9e8635014a18521e5e0.

commit 5070dd097caa6f935803a933117fe6b3000bda47
Author: The Android Automerger <android-build@android.com>
Date:   Wed Nov 2 10:07:57 2011 -0700

    Revert "Merge "Fix potential segfault in RS watchdog." into ics-mr0"

    This reverts commit af675222f6340a8a9edbe9e8635014a18521e5e0, reversing
    changes made to 6e91e5b689a3eb8e6a6f3c038322b8044a9d6670.

commit 5db81e1f1c19ab93c1126a9092213812629c9ece
Author: The Android Automerger <android-build@android.com>
Date:   Wed Nov 2 10:05:33 2011 -0700

    Revert "Merge "Improve the slow query instrumentation." into ics-mr0"

    This reverts commit 2d280f754e32e556407df05d977cfabdfff1c070, reversing
    changes made to 2cc1c5d067736f221554be593c2ba2c96390f847.

commit 116d12b87f319767618e2c0827544412e7e3fd67
Author: The Android Automerger <android-build@android.com>
Date:   Wed Nov 2 04:41:24 2011 -0700

    Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0"

    This reverts commit f0ad147fc33cf55cd9427010b2cdb3eb89b9eec3, reversing
    changes made to bd9b1528051a1b257768fdbc5077a2d4473b02dd.