tree 1f9eebb5f795023bbf46ca5d149ae8c2085ded0f
parent 0774aa6d31ee9b9f84493183b260ad8cb8b61d4e
parent 063b343bebd189b8a95ac2e9e2dd6d30a8a343de
author Winson Chung <winsonc@google.com> 1296175749 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296175749 -0800

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

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