resolved conflicts for merge of 926a5c50 to jb-dev-plus-aosp
resolved conflicts for merge of 926a5c50 to jb-dev-plus-aosp

Change-Id: I1426b282bb4c392b0a5bcb96760c04f215a26b4e

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