Merge branch 'eclair' of git://android.git.kernel.org/platform/packages/apps/Contacts into HEAD