tree abcb30bd606985b0ba9a72bfd5371f21918b29c1
parent 5b741144a6feadb5c51fecb0235c605f0b9fb803
parent 7e3efa82ecbb9e3cf50f8f455e573aed3b88d183
author Jay Shrauner <shrauner@google.com> 1393884302 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1393884302 +0000

am 7e3efa82: am 1f168fd4: am 4ef0aabe: Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev

* commit '7e3efa82ecbb9e3cf50f8f455e573aed3b88d183':
  Catch ActivityNotFoundException in quick contacts badge