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