tree b08b98bffe0ec6fae7aacb96ffad03c09db624e0
parent 95139bfa6c8a64a568a5700d6d254db6294b35d6
parent 19e4d9db28ee6487428879aacd053c319771b51c
author Sunny Goyal <sunnygoyal@google.com> 1431467438 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431467438 +0000

am 19e4d9db: Merge "Preventing NullPointerException when cancelling a shortcut addition" into ub-launcher3-burnaby

* commit '19e4d9db28ee6487428879aacd053c319771b51c':
  Preventing NullPointerException when cancelling a shortcut addition