am a6a4a9ed: am f6c82067: fix a surface leak introduced by a failed merge (DO NOT MERGE)
am a6a4a9ed: am f6c82067: fix a surface leak introduced by a failed merge (DO NOT MERGE)

* commit 'a6a4a9ed46d02ec0c6493a97cd1d3351bdcced63':
  fix a surface leak introduced by a failed merge (DO NOT MERGE)

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