tree 4617e341efa439dca6187614a3291c0860e99e1c
parent ea30fa8e3d82203f93be335bac774ecb5b437b8c
parent 6a3c9f6ed16085b0120e464a32cae597d42253d9
author Jeff Brown <jeffbrown@google.com> 1285370048 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285370048 -0700

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

Merge commit 'ca25d2c31dc20f69597be8f34d6da9167d53b4d0'

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