commit c4de8153f8ec59e13adad16ca6db58888874495b
author Zheng Fu <zhengfu@google.com> Tue Jul 14 00:14:51 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jul 14 00:14:51 2015 +0000
tree 9323f9996dc47f6c58b7cc0d5302a5b9f4e435ac
parent 78f804957632a1de5fbb892da03928d9ffa87cd8
parent ee3253caf8b9800a32186b78f980a9ede85dcab9

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 raw contact.

* commit 'ee3253caf8b9800a32186b78f980a9ede85dcab9':
  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.