resolved conflicts for merge of d053554f to jb-mr1-aah-dev
resolved conflicts for merge of d053554f to jb-mr1-aah-dev

Change-Id: I8540083f7fd04e252c8879475f247ea6bbde8159

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