diff options
author | Ray Essick <essick@google.com> | 2022-04-06 23:12:51 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-06 23:12:51 +0000 |
commit | 1f93a748e4ce1884a97e1e9b6c42f14b15de3842 (patch) | |
tree | 825f49297082c523f9e16a17f9ec399b7e35eee5 | |
parent | c5f6216db8904085287504c5def22ec0c39f663f (diff) | |
parent | 7b9ef3a6e70eef973e9718624bfd316bceb41d75 (diff) | |
download | fdk-aac-1f93a748e4ce1884a97e1e9b6c42f14b15de3842.tar.gz fdk-aac-1f93a748e4ce1884a97e1e9b6c42f14b15de3842.tar.bz2 fdk-aac-1f93a748e4ce1884a97e1e9b6c42f14b15de3842.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: 7b9ef3a6e7 -s ours
am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 067929dcd3 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615057
Change-Id: I0d4b4257b702baf2a9beb40b9d32a9be7a3685fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions