| commit | b843d5c548cae5958fa848497c6c3507ebbb8382 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 08 08:29:35 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 08:29:35 2021 +0000 |
| tree | 6bb80fdede368949dd365d6a7e8a0a401998941e | |
| parent | eab1e2c065f4353b9ad0691ed1d8dac5dce3a23a [diff] | |
| parent | 8896ccc0391587343e08bd5469d73cac70ac0f39 [diff] |
[automerger skipped] Merge "Merge Android 12" am: c03b0fa033 -s ours am: c259e66801 -s ours am: d8cfdda3a9 -s ours am: 8896ccc039 -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: Ie32cd14fd5c988b0e6bebacde07213879d319ba5