am 7f08308f: am 14bdce04: Merge "Remove legacy code that should not be used" into honeycomb
am 7f08308f: am 14bdce04: Merge "Remove legacy code that should not be used" into honeycomb

* commit '7f08308fda8b66f20505d8235795b86f5d8d2e36':
  Remove legacy code that should not be used

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