resolved conflicts for merge of e69f1f1a to master
resolved conflicts for merge of e69f1f1a to master

Change-Id: I32b34e4f6ae83ff40398c6e9e2881af12abc4aa8

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