commit | 9de92eff2494cf56f5240b7514f31fb49c05222a | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Wed Mar 09 10:06:30 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 09 10:06:30 2022 +0000 |
tree | 652c95c8c8ad7018f282d9d49ad0bc264c62f3c1 | |
parent | c5541b3fbefe4778587012a416af817d63f2074d [diff] | |
parent | 181ca35b104fed7f3ca8cd194dfb335c893d32b4 [diff] |
[automerger skipped] Merge "Merge Android 12L" am: c62c7edf66 -s ours am: b3bb5e7732 -s ours am: 181ca35b10 -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: Ic5bdf38c2ae9d8a50510b23c1091c6f5b6143eaf