am 86a6292f: am 95ca9aa2: Merge "stagefright: use media timestamp for default...
am 86a6292f: am 95ca9aa2: Merge "stagefright: use media timestamp for default render timestamp" into mnc-dev
* commit '86a6292f':
stagefright: use media timestamp for default render timestamp