tree b1acf75706396a9bddefe4f57e392020cef7c0ca
parent 74bc6075e13f871a47622d2a08d91b259448a24e
parent 18ad6514bbeb68a96c12ba1636ab8df8e3945f37
author Matthew Xie <mattx@google.com> 1323733167 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1323733167 -0800

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

* commit '18ad6514bbeb68a96c12ba1636ab8df8e3945f37':
  Move broadcastState STATE_TURNING_ON before persistSwitchSetting