aboutsummaryrefslogtreecommitdiffstats
path: root/libFDK/include/FDK_tools_rom.h
diff options
context:
space:
mode:
authorRay Essick <essick@google.com>2022-04-06 22:48:27 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-04-06 22:48:27 +0000
commita88f1c790c31213dc08e2ff306837baa7978d54e (patch)
tree825f49297082c523f9e16a17f9ec399b7e35eee5 /libFDK/include/FDK_tools_rom.h
parente30dba06e75297645f3b8e04f1bbc17d27553cae (diff)
parentb5da046e74799b909863a28dc5fa309af656410a (diff)
downloadfdk-aac-a88f1c790c31213dc08e2ff306837baa7978d54e.tar.gz
fdk-aac-a88f1c790c31213dc08e2ff306837baa7978d54e.tar.bz2
fdk-aac-a88f1c790c31213dc08e2ff306837baa7978d54e.zip
[automerger skipped] Merge changes from topic "presubmit-am-7d8337c3813a47e19898b70f395cf7ea-git_mainline-module-media_swcodec-release-rvc-qpr-dev-sc-dev" into tm-mainline-prod am: b5da046e74 -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: I43aefcb702997e076f7087d82b7ac1ec350c5d6c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libFDK/include/FDK_tools_rom.h')
0 files changed, 0 insertions, 0 deletions