fix NotificationManagerService
Yet another try at fixing this commit
Fix battery.
Merge branch 'jb2' of git://github.com/CarbonDev/android_frameworks_base into jb2
looks like I missed a }
Merge branch 'jb2' of https://github.com/CarbonDev/android_frameworks_base into jb2
Merge branch 'jb2' of github.com:CarbonDev/android_frameworks_base into jb2-PIE