tree e05138462d96896138f81d4450f4242b8e567100
parent 99c070d8eb9f1ff9ea5c38991f15f091040226c2
parent e06749e14c1fb2d78540cba9548ee3b4b7b3b1d9
author Conley Owens <cco3@android.com> 1309447140 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1309447140 -0700

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

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