tree 335ea0ee783cc4a6f1056ad6b8b08c4582687d55
parent a69da9f52f145ccaf4dc8c2727a3937080eb299e
parent 0ca44d17729ff20b54881fcf320e08576ee51a6b
author Tyler Saunders <tylersaunders@google.com> 1708538653 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1708538653 +0000

[automerger skipped] Merge "Remove ExperimentalLifecycleComposeApi" into udc-mainline-prod am: 0ca44d1772 -s ours

am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 5d8fea06b1 is already in history

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

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