merge 9a7773a450e384bbc87b0204f9f0e49ec48de879 w/conflicts
merge 9a7773a450e384bbc87b0204f9f0e49ec48de879 w/conflicts

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