am 599a45af: am 4068b139: Merge "stagefright: propagate consumer usage flags...
am 599a45af: am 4068b139: Merge "stagefright: propagate consumer usage flags in MediaSync" into mnc-dev
* commit '599a45af':
stagefright: propagate consumer usage flags in MediaSync