| commit | 75c4bac5fb6cd83c12f587a54e136e72428cdf49 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 08 07:56:18 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 07:56:18 2021 +0000 |
| tree | 1562a2338a355405228db7d81b19b0f87dd880e3 | |
| parent | 45927bb53af0802b4e5dd1dd36fec59b0be4065a [diff] | |
| parent | 61516b14e717edd82c45b6a3d94ecb9a735b9463 [diff] |
[automerger skipped] Merge "Merge Android 12" am: 2e68054f9c -s ours am: 44afe8eefc -s ours am: 61516b14e7 -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: Icb2f09cd691c1be59a8680eb256d670ce740f57a