| commit | 370ab66900d401ea92edea4dd0d88ae6b0ff1da1 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Dec 14 22:18:50 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 14 22:18:50 2021 +0000 |
| tree | 773b8af3d98adc0f1323c2593a8fe9dc3941d354 | |
| parent | c0572ddaa7c16fb184736e1c9b598a57f05b3f33 [diff] | |
| parent | 539e62512b65c27ecfda10b82a228989b9490458 [diff] |
[automerger skipped] Merge "Merge Android 12 QPR1" am: 798e3d7d11 -s ours am: 50d6b616d7 -s ours am: 54916e10e8 -s ours am: 539e62512b -s ours am skip reason: Merged-In Idd5fcfa840e2a5cb27b5d1c1131c80dd580da3ed with SHA-1 54ee717db8 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1921978 Change-Id: I0cea6e259417d2a643b2176f3a9a8e0641c4ecb3