tree 0784d17d80f88a0c09f9a2c4f6ecc4047af63cef
parent 6d28bf7b303402e72c01ed634692026c7ab148b2
parent de63dc278aafcd6cddd77ca0769fe07c135d8fba
author Dianne Hackborn <hackbod@google.com> 1323141514 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1323141514 -0800

am 0c0120ef: Merge "Fix issue #5714517: App shortcuts can result in bad task intents" into ics-mr1

* commit '0c0120efa2dedaf25ae789bced5a3f9fa33c32bb':
  Fix issue #5714517: App shortcuts can result in bad task intents