resolved conflicts for merge of 99cd6671 to master
resolved conflicts for merge of 99cd6671 to master

Change-Id: I81ac18b1b8291a96bdfa3386f2fe3633fd7eeb79

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