tree fc004d227bb044adc205d43ea46c2f47713f3ede
parent 178db41234abd08925fea9a4dc5180218f7da737
parent 635962e0afb779ba570ce5d89088d99bb22378cf
author Jeff Hamilton <jham@android.com> 1274978689 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1274978689 -0700

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