resolved conflicts for merge of 84872738 to eclair-mr2
resolved conflicts for merge of 84872738 to eclair-mr2

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