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