tree ef3dacc97ff527d3b30b4a1b452ef38d6c5aaa85
parent ce1fec83e524145b517d821a147c8276fffe8aef
parent 038a60f1920d798bc391a376e81980921a75cc34
author Fred Quintana <fredq@google.com> 1260837474 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260837474 -0800

am 038a60f1: moved the hidden sync helpers out of the framework removed the old ContactsProvider

Merge commit '038a60f1920d798bc391a376e81980921a75cc34' into eclair-mr2-plus-aosp

* commit '038a60f1920d798bc391a376e81980921a75cc34':
  moved the hidden sync helpers out of the framework