commit | 181ca35b104fed7f3ca8cd194dfb335c893d32b4 | [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 | 78a50537acb3bdee5be3897cb2a9508a551ac3e9 | |
parent | bae25cbd8458493eadfd5c8e4d3a955ed17dfc46 [diff] | |
parent | b3bb5e77324786d9756331305e2065a2d8771c3d [diff] |
[automerger skipped] Merge "Merge Android 12L" am: c62c7edf66 -s ours am: b3bb5e7732 -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