tree 63c3dda569781e3a04dac92ef133dda6d7050f6c
parent 2e25819fffbb23d42541ead1bf735f3a02fa0330
parent c75fa318ee6a775c6201424e952561e6b9d695e2
author Lajos Molnar <lajos@google.com> 1406055656 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1406046343 +0000

Merge "stagefright: Fix seeking in MPEG4 container - do not merge"