commit | 443e448d278f837ca5bb7f803b3230a23ea71042 | [log] [tgz] |
---|---|---|
author | John Wang <johnwang@google.com> | Wed Apr 07 17:58:53 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 07 17:58:53 2010 -0700 |
tree | ec1cb255bbdad108ce60ceb7267e305a4f0f34e6 | |
parent | 8f4995fc1dfeb81661a636f76a845da7eb8e70e1 [diff] | |
parent | 8551b6600d32e7ac25f59cb36ac5e0599b48a6e3 [diff] |
am 7ecf08fa: am 815b8e4a: Merge "Add emergencyOnly indicator in ServiceState." into froyo Merge commit '7ecf08faa9da7d372dd319aac8b1e5760a116601' into kraken * commit '7ecf08faa9da7d372dd319aac8b1e5760a116601': Add emergencyOnly indicator in ServiceState.