tree 9e0fa3c842110e9b2295609687f7be320eae5bb8
parent 25d9df20a21f9093c076ff7dc5ce5a0dca103f4d
parent befda9c6ad4c2f71596c9f87286c1bbc052b053d
author John Wang <johnwang@google.com> 1270687901 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1270687901 -0700

Merge "Add emergencyOnly indicator in ServiceState." into froyo