merge from froyo-plus-aosp
merge from froyo-plus-aosp

Change-Id: Ic1d0535cb746af0c53a5277b008061f7a2d973a2

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base