tree 700eb1e6893e64d60d9f2f157f02611e97a88d8b
parent 880c1888e35fdb30b636c465efddc8d8dfd702bc
parent cd643187b9cdcf62f0e72a01c09346aab9cc8a5a
author Xin Li <delphij@google.com> 1696590072 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696590072 +0000

[automerger skipped] Merge Android 14 am: 66037ac4fc -s ours am: a73a6ae599 -s ours am: 0fd0b33325 -s ours am: cd643187b9 -s ours

am skip reason: Merged-In I113e998ac78012d1ad6d24a0855d9612c9f33bda with SHA-1 416e2147ab is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/2775993

Change-Id: I1145f6a33dc3852c0edcff8d09c680ec36026a95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>