[automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: c854c108a2 -s ours am: 6df1ae4e5f -s ours am: 74fc91b313 -s ours am: ee03d0172d -s ours am: 582a27ce82 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I2cbeb50b09be1dd84439c61c812f8dfd0875c6c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Bill Yi
2022-04-08 20:03:02 +00:00
committed by Automerger Merge Worker

Diff Content Not Available