tree e03ee5b2ce939420cf29785789da31489cd3d724
parent c947fff47e45b8096f5911f07b7a3ccd35f78ca0
parent 259f78ea96111e957b28f64964f5bdf6efabf51e
author Xin Li <delphij@google.com> 1697759701 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1697759701 +0000

[automerger skipped] Merge 10952656 am: fb4849041f -s ours am: 259f78ea96 -s ours

am skip reason: Merged-In I1145f6a33dc3852c0edcff8d09c680ec36026a95 with SHA-1 46ee7733b9 is already in history

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

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