| commit | d5d66a2b562e9c644d8599ad73d54af0830580ad | [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 | ed597b04e5d050acba318ad9075ea175b4929bdf | |
| parent | a8f15dec670dff2126ab0d940006e0139a9a8228 [diff] | |
| parent | 68e41e54ff587aa4d6976b57f91c2c71dda03227 [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