aboutsummaryrefslogtreecommitdiffstats
path: root/libMpegTPDec
diff options
context:
space:
mode:
authorRay Essick <essick@google.com>2022-04-06 22:56:02 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-04-06 22:56:02 +0000
commit9e4a12aff4383025ea940b522e1a633d7a347b2d (patch)
tree825f49297082c523f9e16a17f9ec399b7e35eee5 /libMpegTPDec
parenta88f1c790c31213dc08e2ff306837baa7978d54e (diff)
parentfc4fd5e0ca96608ebdaa7bbe30835aefeff1a928 (diff)
downloadfdk-aac-9e4a12aff4383025ea940b522e1a633d7a347b2d.tar.gz
fdk-aac-9e4a12aff4383025ea940b522e1a633d7a347b2d.tar.bz2
fdk-aac-9e4a12aff4383025ea940b522e1a633d7a347b2d.zip
[automerger skipped] Merge changes from topic "presubmit-am-7d8337c3813a47e19898b70f395cf7ea-git_mainline-module-media_swcodec-release-rvc-qpr-dev-sc-dev" into tm-dev am: 50b881083a -s ours am: fc4fd5e0ca -s ours
am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 23ef1ac38c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615057 Change-Id: I221aa3d5e1c8e8aeaba6edbcf3eee6d94a24fbbb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libMpegTPDec')
0 files changed, 0 insertions, 0 deletions