NEW FRAMEWORK
UPDATE
Merge

Conflicts:
	core/java/android/provider/Settings.java
	core/java/android/view/VolumePanel.java
	core/res/res/drawable-hdpi/ic_lock_reboot.png
	core/res/res/drawable-hdpi/ic_lock_screenshot.png
	core/res/res/drawable-hdpi/ic_lockscreen_answer_active.png
	core/res/res/drawable-hdpi/stat_sys_adb.png
	core/res/res/drawable-hdpi/stat_sys_tether_bluetooth.png
	core/res/res/drawable-hdpi/stat_sys_tether_usb.png
	core/res/res/drawable-hdpi/stat_sys_tether_wifi.png
	core/res/res/drawable-xhdpi/ic_lock_reboot.png
	core/res/res/drawable-xhdpi/ic_lock_screenshot.png
	core/res/res/drawable-xhdpi/ic_lock_torch.png
	core/res/res/drawable-xhdpi/stat_sys_adb.png
	core/res/res/drawable-xhdpi/stat_sys_tether_bluetooth.png
	core/res/res/drawable-xhdpi/stat_sys_tether_usb.png
	core/res/res/drawable-xhdpi/stat_sys_tether_wifi.png
	packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java