Merge commit '11bea2e216800c5612144f76d307da653d565be3' into froyo-plus-aosp * commit '11bea2e216800c5612144f76d307da653d565be3': Reduce lock contention, removing unnecessary synchronization.
Merge commit '11bea2e216800c5612144f76d307da653d565be3' into froyo-plus-aosp * commit '11bea2e216800c5612144f76d307da653d565be3': Reduce lock contention, removing unnecessary synchronization.