Merge commit 'themes/themes-eclair' into themes-2.2_r1

Conflicts:

	api/current.xml
	core/java/android/app/ActivityManager.java
	core/java/android/app/ActivityThread.java
	core/java/android/app/ApplicationContext.java
	core/java/android/content/Intent.java
	core/java/android/content/pm/PackageInfo.java
	core/java/android/content/res/AssetManager.java
	core/java/android/content/res/Configuration.java
	core/jni/android_util_AssetManager.cpp
	media/java/android/media/Ringtone.java
	services/java/com/android/server/PackageManagerService.java
	services/java/com/android/server/am/ActivityManagerService.java
	test-runner/android/test/mock/MockPackageManager.java