Merge commit 'dc46f6f6cc44954c23229019270b54b8912be825' into froyo-plus-aosp * commit 'dc46f6f6cc44954c23229019270b54b8912be825': Don't enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts.
Merge commit 'dc46f6f6cc44954c23229019270b54b8912be825' into froyo-plus-aosp * commit 'dc46f6f6cc44954c23229019270b54b8912be825': Don't enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts.