am 2f501cc0: am 0ca1e98f: Merge "media: Clarify MediaCodec and...
am 2f501cc0: am 0ca1e98f: Merge "media: Clarify MediaCodec and CodecCapabilities documentation" into mnc-dev
* commit '2f501cc0':
media: Clarify MediaCodec and CodecCapabilities documentation