tree 6491bc99478ebecd6ede5ae5b3126b6ecb7587f9
parent 11509ad61afb7424ce83057b0d2a4b09f853651f
parent a6095969bb5938ad95ee9f858970d5eb54eb124d
author Sunny Goyal <sunnygoyal@google.com> 1431483730 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431483730 +0000

am a6095969: Preventing NullPointerException when cancelling a shortcut addition

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