resolved conflicts for merge of 06fd1dc5 to gingerbread-plus-aosp
resolved conflicts for merge of 06fd1dc5 to gingerbread-plus-aosp

Change-Id: Iae11cabdc3c6b6b59dfdcc3b4944088dded91a52

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