| commit | 54916e10e8bc0611c4fbb2be8f1f34a2d3a9417b | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Dec 14 21:24:07 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 14 21:24:07 2021 +0000 |
| tree | 31273a02e1e1ba36706193cccae724ab3b06e007 | |
| parent | 718c17039eb4b8ca149cb23dd2c68ecc33f6a2ef [diff] | |
| parent | 50d6b616d77222fb9468fe5b8b10dc0358ed971d [diff] |
[automerger skipped] Merge "Merge Android 12 QPR1" am: 798e3d7d11 -s ours am: 50d6b616d7 -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: I5eeeaca9b47404dafc838583ff60cabf80184161