tree f1c043150036981385e5e7d2f70a6451e8d26bd1
parent 07ab11b4f6c693aa65d3fa2bf14cdc6a8f371a1f
parent 928f5052b5f7dfffa2921af769045d85eb483c79
author Android (Google) Code Review <android-gerrit@google.com> 1246926729 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1246926729 -0700

Merge change 6287 into donut

* changes:
  Restore GPS state and ringer/vibrate toggles.