Merge branch 'eclair' of git://android.git.kernel.org/platform/frameworks/base into eclair

Conflicts:
	core/java/android/content/AbstractSyncableContentProvider.java
	telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java
	telephony/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java
	telephony/java/com/android/internal/telephony/gsm/SmsMessage.java