tree 59cac975e7ef8407d45f349e1233cc8389a2072e
parent fd4cd95c78224bedac2a1efd9d6861678b1653e2
parent d5074bef78b0ae682690b04b2afefea142d9eb8f
author Jay Shrauner <shrauner@google.com> 1393889519 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1393889519 +0000

am d5074bef: am f032eef6: am df20623c: am 13a8c8c7: am 5b8f013a: Merge "Fix NPE in deleted contact removal" into klp-dev

* commit 'd5074bef78b0ae682690b04b2afefea142d9eb8f':
  Fix NPE in deleted contact removal