tree 2b37fa8cdb8f39bd5bf5bfa2d9f271e42c002f54
parent e01bfc050e655bfc070255d03e66c403533c1342
parent 3b77a35b1d32154f3665400407d912d5f8d656fd
author Adam Cohen <adamcohen@google.com> 1322088223 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1322088223 -0800

am 3b77a35b: am 80d74893: am ea49c1c8: Merge "Prevent the creation of Shorcuts with null intents (issue 5629292)" into ics-mr1

* commit '3b77a35b1d32154f3665400407d912d5f8d656fd':
  Prevent the creation of Shorcuts with null intents (issue 5629292)