am 0c51de15: Prefer ContactsProvider over GoogleContactsProvider.
am 0c51de15: Prefer ContactsProvider over GoogleContactsProvider.

Merge commit '0c51de15fd3279f1c67d4b9834ebd7334fe82f79'

* commit '0c51de15fd3279f1c67d4b9834ebd7334fe82f79':
  Prefer ContactsProvider over GoogleContactsProvider.

fallouttester/platform_manifest,ND-3500/platform_manifest,RR-msm7x30/platform_manifest,hagar006/platform_manifest,xorware/android_build,pranav01/platform_manifest,xorware/android_build,knone1/platform_manifest,see4ri/lolili,xorware/android_build,xorware/android_build,xorware/android_build,Hybrid-Power/startsync