tree 82094be6d67ccadc5552202cc9ca784b70d860f7
parent ffe477263c503ce75d609d5360cf5e0c72a1363f
parent 4d94a766c3f7cf32dd3f5d543048fa801ad22813
author Jeff Brown <jeffbrown@google.com> 1285369644 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285369644 -0700

am 4d94a766: Fixed some timeout and lock reentrance issues with broadcasts.

Merge commit '4d94a766c3f7cf32dd3f5d543048fa801ad22813' into gingerbread-plus-aosp

* commit '4d94a766c3f7cf32dd3f5d543048fa801ad22813':
  Fixed some timeout and lock reentrance issues with broadcasts.