Fix bad merge.
Fix bad merge.

Change-Id: I4d3aa71f5a4ae13c01e57df25ae7f76d25384f5d

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