summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Larimer <jlarimer@google.com>2015-10-21 03:32:25 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-10-21 03:32:25 +0000
commite20b0eb88c7593c13105b47ce383113fad247d85 (patch)
treed571e81d4cf5ba7714bc686d789f2eeb0a3914cd
parent4f16d200709123a32b16b0e64ce821d6c0893fff (diff)
parent8fbf202f7b9fa461f07b49470c2a6afe39ca6afd (diff)
downloadframeworks_av-e20b0eb88c7593c13105b47ce383113fad247d85.zip
frameworks_av-e20b0eb88c7593c13105b47ce383113fad247d85.tar.gz
frameworks_av-e20b0eb88c7593c13105b47ce383113fad247d85.tar.bz2
Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" into klp-dev am: b1a13d01dc am: 781cd4f37d am: 8565726f57 am: b44e95da77 am: 699e9b0749 am: 8e4f53159c
am: 8fbf202f7b * commit '8fbf202f7b9fa461f07b49470c2a6afe39ca6afd': stagefright: MPEG4Extractor: allow 'hdlr' box before first track
0 files changed, 0 insertions, 0 deletions