resolved conflicts for merge of 7cb8182e to master
resolved conflicts for merge of 7cb8182e 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