aboutsummaryrefslogtreecommitdiffstats
path: root/libPCMutils/src/version.h
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2021-10-08 09:00:04 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-10-08 09:00:04 +0000
commit52c48acfd3a9a6ec0b2e4a3b8288165b2d32589d (patch)
treec6a1ddee22e29d9ea00ec2523071a711368189cd /libPCMutils/src/version.h
parentc2a73571b2b6dcf73683a85cd8fc0a4e3948be7b (diff)
parent5cc7cec66e1435842f5bc8257df6488d5b4fbf2b (diff)
downloadfdk-aac-52c48acfd3a9a6ec0b2e4a3b8288165b2d32589d.tar.gz
fdk-aac-52c48acfd3a9a6ec0b2e4a3b8288165b2d32589d.tar.bz2
fdk-aac-52c48acfd3a9a6ec0b2e4a3b8288165b2d32589d.zip
[automerger skipped] Merge "Merge Android 12" am: 0bfa3fc1cd -s ours am: e5af18bbac -s ours am: 8174082796 -s ours am: 3a30e79d30 -s ours am: 5cc7cec66e -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: Ic6a83a0fa660a67e3a15967a6824f55156f4b8b9
Diffstat (limited to 'libPCMutils/src/version.h')
0 files changed, 0 insertions, 0 deletions