tree 40ad090fb33f57f3bf7c8d3abc763ddaaf105696
parent 6852b198fbedd9378ed79ca6528a4d6f33b0b677
parent 8656145e2abe881caffa4181ee5c2e4e3dba1cee
author Dianne Hackborn <hackbod@google.com> 1271271847 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1271271847 -0700

am 8656145e: Merge "Fix issue #593153: Broadcast time out when sending..." into froyo

Merge commit '8656145e2abe881caffa4181ee5c2e4e3dba1cee' into froyo-plus-aosp

* commit '8656145e2abe881caffa4181ee5c2e4e3dba1cee':
  Fix issue #593153: Broadcast time out when sending...