| commit | d8cfdda3a972acd6995a82474f1bd4d86235660a | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 08 01:39:21 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 01:39:21 2021 +0000 |
| tree | 729b03f82337b6c98add06bd313534723536b89a | |
| parent | be3d5337e6a11c7277d9594e3b47b5b31b575311 [diff] | |
| parent | c259e668015e40e9305c88ec67985f6afcea123e [diff] |
[automerger skipped] Merge "Merge Android 12" am: c03b0fa033 -s ours am: c259e66801 -s ours am skip reason: Merged-In Iba1443da42161f4a41830081f2e1985b30444cc0 with SHA-1 ee05ff24d8 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1847122 Change-Id: Ie051fa26cd626cb4d9a5a9e54ca3e42a340dc024