tree fe15f4b00bb46ba32e811f80b29a56a8b6895556
parent 21f7046fd5aebde51bf64be65c02ed5e87eec484
parent 24f13181b5a24ca8b42fff3acc572208e8203a4a
author Adam Powell <adamp@google.com> 1334088334 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1334088334 -0700

am 24f13181: (-s ours) am d2230d41: am ebc55e37: DO NOT MERGE Fix a bug in TaskStackBuilder where task stack PendingIntents would not clear tasks properly.

* commit '24f13181b5a24ca8b42fff3acc572208e8203a4a':