commit ee3253caf8b9800a32186b78f980a9ede85dcab9
author Zheng Fu <zhengfu@google.com> Mon Jul 13 23:33:03 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 13 23:33:03 2015 +0000
tree 2ab50c1e2e79713c20535ff244d5520f24a56774
parent 727924f9956e725310295e2375ed1d3aed54adda
parent 43f9a00c792966e0f875179163499bb984a86cf1

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 '43f9a00c792966e0f875179163499bb984a86cf1':
  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.