aboutsummaryrefslogtreecommitdiffstats
path: root/libMpegTPEnc/include
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2021-08-17 20:32:44 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-08-17 20:32:44 +0000
commitfec72c2c90577113522ef7667afdb13ed4988fb3 (patch)
treec6a1ddee22e29d9ea00ec2523071a711368189cd /libMpegTPEnc/include
parentdcb2d8bd81e4f71007abed9bc89d67580a56b93a (diff)
parentd327f4f00195d423c9b951be4e624cf3729ef251 (diff)
downloadfdk-aac-fec72c2c90577113522ef7667afdb13ed4988fb3.tar.gz
fdk-aac-fec72c2c90577113522ef7667afdb13ed4988fb3.tar.bz2
fdk-aac-fec72c2c90577113522ef7667afdb13ed4988fb3.zip
[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: a950cd9905 -s ours am: 472cef1b5e -s ours am: d327f4f001 -s ours
am skip reason: Merged-In I18d2a0819145e1f02c8868674eab081ab243f0a9 with SHA-1 dcb2d8bd81 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/15567335 Change-Id: Ie7bbc6582a27a2fde3560a02d1f124418fdea0c7
Diffstat (limited to 'libMpegTPEnc/include')
0 files changed, 0 insertions, 0 deletions