tree ffd0d87c730a32352d1384219ab90f88fc82f101
parent 8be8c43a5e6f74683d8e80581c7fabdd2b517af8
parent ea49c1c8610ad7eb0367d073a410e989c8998160
author Adam Cohen <adamcohen@google.com> 1322087983 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1322087983 -0800

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

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