am b19b6fec: am 966fcb81: Revert "fix [2542425] memory leak during video recording"
am b19b6fec: am 966fcb81: Revert "fix [2542425] memory leak during video recording"

Merge commit 'b19b6fec04de14860efb47d59084a66bb288cc98' into kraken

* commit 'b19b6fec04de14860efb47d59084a66bb288cc98':
  Revert "fix [2542425] memory leak during video recording"

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