commit | 54c5abdbe6f44fc00d699acf2ad8cb5aa10013ea | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Mar 08 11:07:50 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 08 11:07:50 2022 +0000 |
tree | e70cf96bbdf1cc64d86e30c5e7bdc352b19a3607 | |
parent | 1ad4bcb4db08d64b4986e61dee2046b97f321477 [diff] | |
parent | 63bfd9364c254168bd5d3d3318c5fdadc1a94df2 [diff] |
[automerger skipped] Merge "Merge Android 12L" am: 0f839e536d -s ours am: 63bfd9364c -s ours am skip reason: Merged-In I2bf469307acd968bf4faa789a9325173d6351c1d with SHA-1 19929dffff is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2012639 Change-Id: I1af88120867af436e20d915a862fb4475f8d5c9c