aboutsummaryrefslogtreecommitdiffstats
path: root/libMpegTPDec
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-07-02 15:25:32 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-07-02 15:25:32 -0700
commit916e0784d6429eb89ee503c4589b04cf76b61675 (patch)
treefa62c4f58bc140ba5c0a27e2c913d3ea0a5bfe98 /libMpegTPDec
parent622fc42193d7f7dacf21b346f7b31f359efd5d54 (diff)
parent0942f837c5f7ad8a70024161c0ea4ecf2d18bcbe (diff)
downloadfdk-aac-916e0784d6429eb89ee503c4589b04cf76b61675.tar.gz
fdk-aac-916e0784d6429eb89ee503c4589b04cf76b61675.tar.bz2
fdk-aac-916e0784d6429eb89ee503c4589b04cf76b61675.zip
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 4d56b880e2
am: 0942f837c5 -s ours am skip reason: subject contains skip directive Change-Id: Ia49c4c0c1b61b95d4393f7312189c237d86e5ea2
Diffstat (limited to 'libMpegTPDec')
0 files changed, 0 insertions, 0 deletions