aboutsummaryrefslogtreecommitdiffstats
path: root/libMpegTPEnc/include
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2021-10-08 08:29:53 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-10-08 08:29:53 +0000
commit5cc7cec66e1435842f5bc8257df6488d5b4fbf2b (patch)
treec6a1ddee22e29d9ea00ec2523071a711368189cd /libMpegTPEnc/include
parentfec72c2c90577113522ef7667afdb13ed4988fb3 (diff)
parent3a30e79d30d56f3e3bd0ac6f2ae7254d89f6b77c (diff)
downloadfdk-aac-5cc7cec66e1435842f5bc8257df6488d5b4fbf2b.tar.gz
fdk-aac-5cc7cec66e1435842f5bc8257df6488d5b4fbf2b.tar.bz2
fdk-aac-5cc7cec66e1435842f5bc8257df6488d5b4fbf2b.zip
[automerger skipped] Merge "Merge Android 12" am: 0bfa3fc1cd -s ours am: e5af18bbac -s ours am: 8174082796 -s ours am: 3a30e79d30 -s ours
am skip reason: Merged-In Ia7a8fba7d5108dd4281a47b1aa15966bb6eee947 with SHA-1 a950cd9905 is already in history Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1847533 Change-Id: I1c15a27d8a78adbe60ecbc1732457f42e5770cfb
Diffstat (limited to 'libMpegTPEnc/include')
0 files changed, 0 insertions, 0 deletions