tree 967f2714b7c695a2c8690d8099672ae2c639bbb8
parent d380605679b46368048ec688c6c90a00d256026a
parent 94e7305bc498d772b8799317c4c02a8925850545
author Jay Shrauner <shrauner@google.com> 1400024931 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400024931 +0000

am 94e7305b: am 3fb7218a: Fix NPE in dismissShortcut

* commit '94e7305bc498d772b8799317c4c02a8925850545':