am b40bbe7d: Merge "Remove defunct flag"
am b40bbe7d: Merge "Remove defunct flag"

* commit 'b40bbe7d8e9a5a60f4b67ca439f31b2d095f2481':
  Remove defunct flag

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