| commit | 9a9a0a400f57808c59cb0e7c0a99f3603e3a71b7 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Dec 14 21:24:12 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 14 21:24:12 2021 +0000 |
| tree | ae48106dc388ed8c7a385d03edb046f4e24ae660 | |
| parent | 6429df0d1e68e62ee4915101006ee36cbd487c84 [diff] | |
| parent | 381688f57819aefa5291a36e0d30411c8bf5b257 [diff] |
[automerger skipped] Merge "Merge Android 12 QPR1" am: 85d715bac3 -s ours am: 381688f578 -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: Ib2be8e0ddbda62bf7df1a1fd062e672faa55dd5a