am bf4bf904: (-s ours) am 7878f087: (-s ours) Merge "stagefright: Fix seeking...
am bf4bf904: (-s ours) am 7878f087: (-s ours) Merge "stagefright: Fix seeking in MPEG4 container - do not merge"
* commit 'bf4bf904':
stagefright: Fix seeking in MPEG4 container - do not merge