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