Merge commit 'ebf0bbaaf03269eda9831e3c6b5ff82010b1de57' into eclair-plus-aosp * commit 'ebf0bbaaf03269eda9831e3c6b5ff82010b1de57': Add better service reporting.
Merge commit 'ebf0bbaaf03269eda9831e3c6b5ff82010b1de57' into eclair-plus-aosp * commit 'ebf0bbaaf03269eda9831e3c6b5ff82010b1de57': Add better service reporting.