am f60667b1: Merge "Cleanup a unused setting"
am f60667b1: Merge "Cleanup a unused setting"

* commit 'f60667b17423fbf1e03fe26ca04e012391034219':
  Cleanup a unused setting

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