resolved conflicts for merge of a442e791 to eclair-mr2-plus-aosp
resolved conflicts for merge of a442e791 to eclair-mr2-plus-aosp

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