am 580387a4: (-s ours) am c721e71f: DO NOT MERGE libmedia: add sub resource...
am 580387a4: (-s ours) am c721e71f: DO NOT MERGE libmedia: add sub resource type audio-codec and video-codec.
* commit '580387a4':
DO NOT MERGE libmedia: add sub resource type audio-codec and video-codec.