| commit | 381688f57819aefa5291a36e0d30411c8bf5b257 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Dec 14 21:00:19 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 14 21:00:19 2021 +0000 |
| tree | 3a7bf968e95b99c31f55409d3ab43a15a7539465 | |
| parent | a6d1bd6b57d492be5c3216bb37467857cbfa93f7 [diff] | |
| parent | 85d715bac3b907955a653322039e1cbcdea6bb6f [diff] |
[automerger skipped] Merge "Merge Android 12 QPR1" am: 85d715bac3 -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: Ia8ea1d733eb1f24f0deb248a76c5f135cd63b3e5