tree e5fb6023081458516b4f65a23b7e1c81dca8d4ec
parent 0b907de36776acb833cbb2d2c7edb7eb75ecde41
parent f13586eae96771fde7a4dea26d1d07a3e27d19fd
author Sunny Goyal <sunnygoyal@google.com> 1431484067 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431484067 +0000

am f13586ea: am a6095969: Preventing NullPointerException when cancelling a shortcut addition

* commit 'f13586eae96771fde7a4dea26d1d07a3e27d19fd':
  Preventing NullPointerException when cancelling a shortcut addition