tree 83705ad98f9fb6f863f83ba4e1cd740a9f7e6646
parent d2a9194b6119051962edab14cc26d12706867c72
parent 968795679be0a3f0118d5a6e2e1580808da5716d
author Michael Jurka <mikejurka@google.com> 1335564864 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1335564864 -0700

Merge "Set FLAG_ACTIVITY_RESET_TASK_IF_NEEDED for all app shortcuts" into jb-dev