Merge commit '1c95ecb47a19e18d0c51f3fd2931d13e9bd845b9' into gingerbread-plus-aosp * commit '1c95ecb47a19e18d0c51f3fd2931d13e9bd845b9': recombine StatusBarService and PhoneStatusBarService
Merge commit '1c95ecb47a19e18d0c51f3fd2931d13e9bd845b9' into gingerbread-plus-aosp * commit '1c95ecb47a19e18d0c51f3fd2931d13e9bd845b9': recombine StatusBarService and PhoneStatusBarService