tree c5c528eb6f8fd4b6fc664b1c79e08f37cf83b94e
parent 5e50d7b55e8f5914f883b32c52c6f891e578e333
parent 1e76f8882ec9b0505baf8350f000b97bddc90578
author Sunny Goyal <sunnygoyal@google.com> 1413799373 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413799373 +0000

am 1e76f888: Merge "Adding NPE check in InstallShortcutReceiver" into ub-now-queens

* commit '1e76f8882ec9b0505baf8350f000b97bddc90578':
  Adding NPE check in InstallShortcutReceiver