am 94f70cbb: Merge change 1685 into donut
am 94f70cbb: Merge change 1685 into donut

Merge commit '94f70cbbe29c3aca748df9d543c366d838f6598b'

* commit '94f70cbbe29c3aca748df9d543c366d838f6598b':
  Remove unnecessary code.

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