am 0ffe8f97: am 39a8a377: (-s ours) am ddd1c72b: (-s ours) Merge "DO NOT MERGE: mediaplayer: ensure secure decoders are instantiated before starting source"
* commit '0ffe8f97':
DO NOT MERGE: mediaplayer: ensure secure decoders are instantiated before starting source