tree 2bd5de1d207a09760cfd57d7b07f2dcd1e05c495
parent 3b61f479cdc6efc0a181103f14e59ec520f08713
parent 59cb2cf15c912280b32292c79c2c0e5bfea49b68
author Dianne Hackborn <hackbod@google.com> 1350089199 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350089199 -0700

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

* commit '59cb2cf15c912280b32292c79c2c0e5bfea49b68':
  Revert fix to issue #6880627: PendingIntent.getService() returns...