am 5d4851c9: am 1ec856e6: Merge "stagefright: allow controlling experiments...
am 5d4851c9: am 1ec856e6: Merge "stagefright: allow controlling experiments from property" into mnc-dev
* commit '5d4851c9':
stagefright: allow controlling experiments from property