[automerger skipped] Merge "RESTRICT AUTOMERGE Set the container field of aconfig flags" into main am: 14d4df602b am: 7812cfcee5 -s ours

am skip reason: contains skip directive

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

Change-Id: Iab59ef6dd7d0b373ad6ab22c2e2d4f19b66c4ec1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Oriol Prieto Gascó
2024-05-03 14:52:34 +00:00
committed by Automerger Merge Worker

Diff Content Not Available