am 48f6b7e2: am 59cb2cf1: Merge "Revert fix to issue #6880627:...
am 48f6b7e2: am 59cb2cf1: Merge "Revert fix to issue #6880627: PendingIntent.getService() returns..." into jb-mr1-dev
* commit '48f6b7e2':
Revert fix to issue #6880627: PendingIntent.getService() returns...