tree 9699d6a4d2e87d701187d93916621e1b7dff999b
parent 0378676b3f12158537a01916e69f6ab51817605f
parent 8e4f53159c64996e1617ec589977c290fa233010
author Jon Larimer <jlarimer@google.com> 1445398055 +0000
committer android-build-merger <android-build-merger@google.com> 1445398055 +0000

Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" into klp-dev am: b1a13d01dc am: 781cd4f37d am: 8565726f57 am: b44e95da77 am: 699e9b0749
am: 8e4f53159c

* commit '8e4f53159c64996e1617ec589977c290fa233010':
  stagefright: MPEG4Extractor: allow 'hdlr' box before first track