commit e91d40981dc987fd5a0b4c4f0b89791f69bea7d7
author Zheng Fu <zhengfu@google.com> Tue Jul 14 16:42:00 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jul 14 16:42:00 2015 +0000
tree 73133bfb73ce2c50db1eef186a3936bc6824bfab
parent 84a2df63b8d527c38d6f522922657c04dc90dcde
parent 8697c675d86672d5f491042c0aeb7ae4ab3476ee

am 8697c675: am c4de8153: am ee3253ca: am 43f9a00c: am cc9ce6b1: Dealing with some edge cases with soft deleted contacts. 1. Exlude soft deleted contacts for aggregator algorithm upgrade. 2. Make sure to update the contacts.name_raw_contact_id column for soft deleted

* commit '8697c675d86672d5f491042c0aeb7ae4ab3476ee':
  Dealing with some edge cases with soft deleted contacts. 1. Exlude soft deleted contacts for aggregator algorithm upgrade. 2. Make sure to update the contacts.name_raw_contact_id column for soft deleted raw contact.