[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: 352bcbcbc4 -s ours

Browse Source

am skip reason: contains skip directive

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

Change-Id: I5cc79f583152d2402312cf0b49de95b930db1eb3
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:51:01 +00:00

committed by Automerger Merge Worker

parent 22541a8377 352bcbcbc4

commit ba400e5833

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available