tree 1562a2338a355405228db7d81b19b0f87dd880e3
parent 9a481e5398cd6ceb4607fe272db06effc588c939
parent 75c4bac5fb6cd83c12f587a54e136e72428cdf49
author Xin Li <delphij@google.com> 1633681756 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633681756 +0000

[automerger skipped] Merge "Merge Android 12" am: 2e68054f9c -s ours am: 44afe8eefc -s ours am: 61516b14e7 -s ours am: 75c4bac5fb -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: Ic1dc7a1cedb9dc5706b3fbb9c22a2739467a0139