am 4c57b530: am 14ae2c0d: Merge "ACodec: call cancelBufferToNativeWindow()...
am 4c57b530: am 14ae2c0d: Merge "ACodec: call cancelBufferToNativeWindow() only when the buffer is owned by us." into mnc-dev
* commit '4c57b530':
ACodec: call cancelBufferToNativeWindow() only when the buffer is owned by us.