[automerger skipped] Merge "[RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage()" into sc-dev am: 952dbb9aa3 am: d0f5ccb499 -s ours am: 20f8ad98fb -s ours am: 357d9ecbdb -s ours am: 506fc66f7c -s ours am: 1120050213 -s ours

am skip reason: contains skip directive

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

Change-Id: I193844aa8bf3765981c94c5d6b250435d14282fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-06-12 20:42:18 +00:00
committed by Automerger Merge Worker

Diff Content Not Available