am 51cf3661: am f38b5287: Merge "MediaFormat: Explain that KEY_COLOR_FORMAT is...
am 51cf3661: am f38b5287: Merge "MediaFormat: Explain that KEY_COLOR_FORMAT is used with decoders as well"
* commit '51cf3661':
MediaFormat: Explain that KEY_COLOR_FORMAT is used with decoders as well