tree 2b37fa8cdb8f39bd5bf5bfa2d9f271e42c002f54
parent ee951cc5120c82ee2c50d63f10ba453bdbb2a41a
parent 80d748932ac2e6774f3e574bb4b9228b849cf6d5
author Adam Cohen <adamcohen@google.com> 1322088140 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1322088140 -0800

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

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