tree 5350a10eb1a9b3e3f4cdb18d380acd3af6f9a235
parent 2df3dd1363074ca70428f855b9b8e8c3b30c7371
parent 69c06ebb5850710b07f8fee06e23fde604b4c5d0
author Jay Shrauner <shrauner@google.com> 1409735656 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409735656 +0000

am 69c06ebb: am c656552b: am b973c146: Merge "Fix NPE in QuickContactActivity" into lmp-dev

* commit '69c06ebb5850710b07f8fee06e23fde604b4c5d0':
  Fix NPE in QuickContactActivity