Merge commit 'cf3a08307d1599eaa91d7cc4e7c601e5fa13037f' into eclair-plus-aosp * commit 'cf3a08307d1599eaa91d7cc4e7c601e5fa13037f': Add more control over a service's start state.
Merge commit 'cf3a08307d1599eaa91d7cc4e7c601e5fa13037f' into eclair-plus-aosp * commit 'cf3a08307d1599eaa91d7cc4e7c601e5fa13037f': Add more control over a service's start state.