am 78ce1c52: Add back clobbered cleanup
am 78ce1c52: Add back clobbered cleanup

* commit '78ce1c5247de60a4247d81d168fd9fa97c7591d0':
  Add back clobbered cleanup

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