| commit | 455bde2613d2bd247d967ee465eee05f8734996b | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Dec 14 21:51:04 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 14 21:51:04 2021 +0000 |
| tree | edb4314d82d5c55f0b98b476d9fd2159de2667b4 | |
| parent | 87b78cc8a7a32f714af8e810c2fd3366233b6d1a [diff] | |
| parent | 9a9a0a400f57808c59cb0e7c0a99f3603e3a71b7 [diff] |
[automerger skipped] Merge "Merge Android 12 QPR1" am: 85d715bac3 -s ours am: 381688f578 -s ours am: 9a9a0a400f -s ours am skip reason: Merged-In Ibcfed4617dcaea3b81e5d3a3eb68e6494488c7f7 with SHA-1 655d7f9857 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1921235 Change-Id: I11136e25a0d64f14ca4328100fd93d597a1ecf8b