resolved conflicts for merge of 410ea6 to master
resolved conflicts for merge of 410ea6 to master

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