commit | f9ab1c41d6a385f90a49ef4712ebefcf35bcacf1 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Dec 13 19:42:05 2024 -0800 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 13 19:42:05 2024 -0800 |
tree | 12ead83588b0b309e8d88bbde9c786327e639407 | |
parent | 7307f34866abeb1e3af3339dcfe4ddf4388390f4 [diff] | |
parent | 413f38d475439db2df097d589371c20e7109ac97 [diff] |
[automerger skipped] Merge 24Q4 into AOSP main am: 413f38d475 -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/+/3413682 Change-Id: I136a103a327d16f63876d046fc14b2e52e197041 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>