Merge commit '7b2aa74f4644979acea456e1047c96e17e09bc6d' into eclair-mr2-plus-aosp * commit '7b2aa74f4644979acea456e1047c96e17e09bc6d': Fix for 2221718: Hang in BatteryStatsService.noteBluetoothOn
Merge commit '7b2aa74f4644979acea456e1047c96e17e09bc6d' into eclair-mr2-plus-aosp * commit '7b2aa74f4644979acea456e1047c96e17e09bc6d': Fix for 2221718: Hang in BatteryStatsService.noteBluetoothOn