tree 2a3b29767458761c0c411fddbc2cbb6381c2facf
parent c05c83e272f8806d46a4e2470d000f2112e6efb2
parent cc86c933f69e4c1d55e0f4f49936d04fb60d6bcf
author Daniel Sandler <dsandler@android.com> 1276806356 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1276806356 -0700

am cc86c933: Merge "New API for high-priority Notifications and full-screen alerts." into gingerbread

Merge commit 'cc86c933f69e4c1d55e0f4f49936d04fb60d6bcf' into gingerbread-plus-aosp

* commit 'cc86c933f69e4c1d55e0f4f49936d04fb60d6bcf':
  New API for high-priority Notifications and full-screen alerts.