tree 1562a2338a355405228db7d81b19b0f87dd880e3
parent 2c553680c11cac24098492a317daebdb3a106e48
parent 44afe8eefcf9efa693750ed08002e0db34b50619
author Xin Li <delphij@google.com> 1633657142 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633657142 +0000

[automerger skipped] Merge "Merge Android 12" am: 2e68054f9c -s ours am: 44afe8eefc -s ours

am skip reason: Merged-In I7cd7021ec32823bc87ddce98e10158af4fcc1f3c with SHA-1 7822d86cc4 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/flac/+/1847356

Change-Id: Ie544f211e95dc4ad437eface84003bc5e3b70a88