7b2aa74f46
Merge commit '4ab2c7770c8e55072ee7a083fa84e318e07c8c3e' into eclair-mr2 * commit '4ab2c7770c8e55072ee7a083fa84e318e07c8c3e': Fix for 2221718: Hang in BatteryStatsService.noteBluetoothOn