tree 3f99fd3784efc458c5d0cc49fe332c20adaa71cd
parent 0562efd1ea970ded01b1b47bbce790a269a60c45
parent 98395483e4309f7b92348136491575861008b3c0
author Conley Owens <cco3@android.com> 1309447513 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1309447513 -0700

am 98395483: am 9f2cbf14: am e06749e1: Merge "Add FLAG_AUTO_CANCEL flag for multiple supl notifications."

* commit '98395483e4309f7b92348136491575861008b3c0':
  Add FLAG_AUTO_CANCEL flag for multiple supl notifications.