am 83c8ad6d: Merge "Fixing formatting, removing tabs"
am 83c8ad6d: Merge "Fixing formatting, removing tabs"

* commit '83c8ad6de581ad3a68421587e0fe8145c5f335af':
  Fixing formatting, removing tabs

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