am 18ad6514: am ed0830c5: Merge "Move broadcastState STATE_TURNING_ON before...
am 18ad6514: am ed0830c5: Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1
* commit '18ad6514':
Move broadcastState STATE_TURNING_ON before persistSwitchSetting