tree bc9ed8368a8843791d8b14d52dec43476d53e91c
parent f3ea02319fc8d1f882ef7f392c245e197ab858de
parent ed0830c502d7403d69abfd8247c046ac2746ac8c
author Matthew Xie <mattx@google.com> 1323720553 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1323720553 -0800

am ed0830c5: Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1

* commit 'ed0830c502d7403d69abfd8247c046ac2746ac8c':
  Move broadcastState STATE_TURNING_ON before persistSwitchSetting