tree 1562a2338a355405228db7d81b19b0f87dd880e3
parent 7822d86cc421b8ef4ef40620f6520d3c393d06b7
parent 2e68054f9cfa1a55d8a42b2880d95ddcf4678168
author Xin Li <delphij@google.com> 1633655976 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633655976 +0000

[automerger skipped] Merge "Merge Android 12" am: 2e68054f9c -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: Ic41232477df9fbc36127246a2f5b4b5d0df94963