resolved conflicts for merge of 1cbf8493 to master
resolved conflicts for merge of 1cbf8493 to master

Change-Id: Ifea2ba8b02ecf291fbd1612973647a95a70511c4

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