tree ca3728acdffc2e026245edda125e0949ad4b321a
parent 6d8cb2b3c863c7361750b3c594237ceb36a43dd9
parent 65af56cf9d8d63e10cf961e1468a5e86d4081405
author Winson Chung <winsonc@google.com> 1296175659 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296175659 -0800

am 65af56cf: Merge "Adding check to prevent NPE when we get a badly encoded install-shortcut intent. (3398526)" into honeycomb

* commit '65af56cf9d8d63e10cf961e1468a5e86d4081405':
  Adding check to prevent NPE when we get a badly encoded install-shortcut intent. (3398526)