Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/providers/ContactsProvider into eclair-mr2-plus-aosp
am 1bf3b382: am e19d06c1: Merge change I92d49bcd into eclair

Merge commit '1bf3b382708563d0628d3669525a83c1a136f278' into eclair-mr2-plus-aosp

* commit '1bf3b382708563d0628d3669525a83c1a136f278':
am fba6e322: am 6581e1d1: [Issue 2176922] Raising aggregation suggestion threshold for email addresses from 0.82 to 0.95

Merge commit 'fba6e322ebb788660099041d406388f6046b2842' into eclair-mr2-plus-aosp

* commit 'fba6e322ebb788660099041d406388f6046b2842':
am b9e55995: [Issue 2176079] Fixing the test: ContactAggregatorPerformanceTest

Merge commit 'b9e55995411cc4390972a552e5361727ad795374' into eclair-mr2

* commit 'b9e55995411cc4390972a552e5361727ad795374':
  [Issue 2176079] Fixing the test: ContactAggregatorPerformanceTest
am b9e55995: [Issue 2176079] Fixing the test: ContactAggregatorPerformanceTest

Merge commit 'b9e55995411cc4390972a552e5361727ad795374' into eclair-plus-aosp

* commit 'b9e55995411cc4390972a552e5361727ad795374':
  [Issue 2176079] Fixing the test: ContactAggregatorPerformanceTest
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/providers/ContactsProvider into eclair-mr2-plus-aosp
am 24aa3c40: am b9e55995: [Issue 2176079] Fixing the test: ContactAggregatorPerformanceTest

Merge commit '24aa3c4087d9cf101cf7866dff5ec68d52db77eb' into eclair-mr2-plus-aosp

* commit '24aa3c4087d9cf101cf7866dff5ec68d52db77eb':
[Issue 2168777] Favoring visible contacts on insert of presence/status updates.

Change-Id: If581fb64017ca4dc74c5c3f1805fa96f722fa6cd
am c03e723e: [Issue 2168777] Favoring visible contacts on insert of presence/status updates.

Merge commit 'c03e723e7b07434a3e60454606bc18e2df4ee06b' into eclair-plus-aosp

* commit 'c03e723e7b07434a3e60454606bc18e2df4ee06b':
  [Issue 2168777] Favoring visible contacts on insert of presence/status updates.
am 6ce24dc1: Force sync to happen if Groups.SHOULD_SYNC is set.

Merge commit '6ce24dc1d53f1ed2760a06cd60c705ebdf666f43'

* commit '6ce24dc1d53f1ed2760a06cd60c705ebdf666f43':
  Force sync to happen if Groups.SHOULD_SYNC is set.
am b5a31634: Work on issue #2163789: Way too much logging

Merge commit 'b5a3163481794babda78716e576e35818de0cc03'

* commit 'b5a3163481794babda78716e576e35818de0cc03':
  Work on issue #2163789: Way too much logging
am 563e6dd3: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/packages/providers/ContactsProvider into eclair-mr2-plus-aosp

Merge commit '563e6dd3c22617649028dd20f8f0c921bcaec7db'

* commit '563e6dd3c22617649028dd20f8f0c921bcaec7db':
am e3bd5ab8: am 14b8a124: Change selection argument so that it complies with the current view given from ContactsProvider2.

Merge commit 'e3bd5ab84ed288b35361a94433dd90a7a2e33fc7'

* commit 'e3bd5ab84ed288b35361a94433dd90a7a2e33fc7':
  Change selection argument so that it complies with the current view
am 98fa11d7: am 5b4b305b: account manager api review changes

Merge commit '98fa11d79e8a54cc48d474d76b22d97a6004ad0b'

* commit '98fa11d79e8a54cc48d474d76b22d97a6004ad0b':
  account manager api review changes
am f2d858a7: am f8b937f6: [Issue 2157431] Optimizing the Status Update insert into the contacts database.

Merge commit 'f2d858a76a4ffafc1ec23585302a2169353d8c4b'

* commit 'f2d858a76a4ffafc1ec23585302a2169353d8c4b':
  [Issue 2157431] Optimizing the Status Update insert into the contacts database.
am a4e17caa: am dd0e0f44: [Issue 2160728] Fixing full name update when parts of structured name are deleted

Merge commit 'a4e17caa4a9a5e9244fff039f47f39ad891dafa9'

* commit 'a4e17caa4a9a5e9244fff039f47f39ad891dafa9':
  [Issue 2160728] Fixing full name update when parts of structured name are deleted
am dc9b8fd6: am e2a3fb8c: Fix lookup query throwing exception for null displayNames.

Merge commit 'dc9b8fd636e22b71b7ef36eb94afd010a43121c9'

* commit 'dc9b8fd636e22b71b7ef36eb94afd010a43121c9':
  Fix lookup query throwing exception for null displayNames.
am f4546a19: am 46b7bfa3: - create a Uri for and expose the contacts entities uri - change the EntityIterator to use that Uri - fix the column naming in the entities view

Merge commit 'f4546a1972e4b10d5eb573d8041016fecf5aa8e2'

* commit 'f4546a1972e4b10d5eb573d8041016fecf5aa8e2':
  - create a Uri for and expose the contacts entities uri
am 32d53cfe: am a0e72d9b: [Issue 2134623] Optimizing the view_data view, which was doing a full scan of the data table.

Merge commit '32d53cfefca0b4cba45fc3e5ab8a2cf41d70b991'

* commit '32d53cfefca0b4cba45fc3e5ab8a2cf41d70b991':
  [Issue 2134623] Optimizing the view_data view, which was doing a full scan of the data table.
am 28092175: am 3e2bf19e: Merge change I5ee7b933 into eclair

Merge commit '280921755bfa75748d555036d56615535b4d9c0f'

* commit '280921755bfa75748d555036d56615535b4d9c0f':
  Mark a ContactsProvider string as being untranslatable.