tree 83705ad98f9fb6f863f83ba4e1cd740a9f7e6646
parent ba1474d2acb7d65b8db28d00b2aa9bcfb7059d2c
parent 727f0e1292dccc1916c7e3d54ff70385ae329108
author Michael Jurka <mikejurka@google.com> 1335565123 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1335565123 -0700

am 727f0e12: Merge "Set FLAG_ACTIVITY_RESET_TASK_IF_NEEDED for all app shortcuts" into jb-dev

* commit '727f0e1292dccc1916c7e3d54ff70385ae329108':
  Set FLAG_ACTIVITY_RESET_TASK_IF_NEEDED for all app shortcuts