resolved conflicts for merge of 4de60b26 to jb-dev-plus-aosp
resolved conflicts for merge of 4de60b26 to jb-dev-plus-aosp

Change-Id: Id1b1847a3ab5c0f51ac8a732fce5ba12e5810259

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