tree 2652900dd60667dd8a2c9b08c38aa63b25920898
parent e550d21360287c752fd79a67f1962244ee272be1
parent 8565726f5775a6db97a394aa18a1f6b0e1ce69b7
author Jon Larimer <jlarimer@google.com> 1445376475 +0000
committer android-build-merger <android-build-merger@google.com> 1445376475 +0000

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

* commit '8565726f5775a6db97a394aa18a1f6b0e1ce69b7':
  stagefright: MPEG4Extractor: allow 'hdlr' box before first track