7ecf08faa9
Merge commit '815b8e4ac4ddb20e8c0539ecba50c9e7382d0656' into froyo-plus-aosp * commit '815b8e4ac4ddb20e8c0539ecba50c9e7382d0656': Add emergencyOnly indicator in ServiceState.