am 3efe6516: am 6597c00f: stagefright: add (temporary) support for automatic...
am 3efe6516: am 6597c00f: stagefright: add (temporary) support for automatic video frc automerge: 73c5c94a
* commit '3efe6516':
stagefright: add (temporary) support for automatic video frc