[automerger skipped] Merge "Fixing test that is breaking in some environments. Test: atest com.android.server.pm.CrossProfileAppsServiceImplTest#startActivityAsUser_sameTask_fromProfile_success Bug: 252837119" am: cd2a855610 am: 373bd79698 am: 4db1d7ea8a -s ours

Browse Source

am skip reason: Merged-In Ie0ca41247b80f927ef1377866d1a2d2d2deb5333 with SHA-1 9ff47bcbaa is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2328240

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

...

This commit is contained in:

Gareth Vaughan

2022-12-07 23:06:25 +00:00

committed by Automerger Merge Worker

parent 45d58d76cf 4db1d7ea8a

commit 47025f2b21

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