resolved conflicts for merge of 6248cdd5 to master
resolved conflicts for merge of 6248cdd5 to master

Change-Id: I4f7f69c28c90ff4fb8e2db9468d8024162f62c7b

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