tree 68a789aa91ae507d00c4e816d27083f256aa19c3
parent 2cb138dbe89c493547066679e1a8ef1ae0a848de
parent edf228ce1fc9aae9fe314229c19e80a434bb4393
author Jeff Hamilton <jham@android.com> 1274978564 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1274978564 -0700

am edf228ce: am dc46f6f6: Merge "Don\'t enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts." into froyo

Merge commit 'edf228ce1fc9aae9fe314229c19e80a434bb4393' into kraken

* commit 'edf228ce1fc9aae9fe314229c19e80a434bb4393':
  Don't enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts.