commit | b6297075e02a3109f5266c836bc236b9ace01fae | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Dec 14 22:18:52 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 14 22:18:52 2021 +0000 |
tree | 2e640a0707569afa88695653f8496636ac00e249 | |
parent | cc330428f8d6741aeb9d7e0ff65ea9281487e35f [diff] | |
parent | 0c444fe3ff6a76c0d63a8afdcf4d1649c03f6e96 [diff] |
[automerger skipped] Merge "Merge Android 12 QPR1" am: 1b43aadaeb -s ours am: 7ed5a10fc8 -s ours am: 2734eb73f2 -s ours am: 0c444fe3ff -s ours am skip reason: Merged-In I17688436501ef743e1c322453dfeedddf796bba7 with SHA-1 38e932a8c1 is already in history Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/1921896 Change-Id: Ie5efc1d3ded21372237f0ed7a9f88be90a13def3