| commit | 49d8ff965da2de4c262d8d53d142b7b1cc7de9c1 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Dec 13 21:24:16 2024 -0800 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 13 21:24:16 2024 -0800 |
| tree | c16f49865511645f1ad1471c2342b61d8c9295c3 | |
| parent | c5bc2fafb43e471b0410504adcd6ec2e81d2eff4 [diff] | |
| parent | 9ee5de3b2ff98ed061ad4e6bce33e703b0c3e95f [diff] |
[automerger skipped] Merge "Merge 24Q4 into AOSP main" into main am: b1c96fcf83 -s ours am: 9ee5de3b2f -s ours am skip reason: Merged-In I2c1246a4b34c6b09a42c05153c0e3f015d475df1 with SHA-1 c47df6271a is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3412198 Change-Id: If673e7532a8679449edb1b727ce64f5463fd2baa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>