diff options
| author | 2024-12-09 18:56:01 +0000 | |
|---|---|---|
| committer | 2024-12-09 18:56:01 +0000 | |
| commit | 5a5eab22290bbbd1b44e67ced22fb72119938fc1 (patch) | |
| tree | 10d727cf19c5990fe83335c1d4fb2e7037c767df | |
| parent | f3775f7f4cb1318e5c792c13b24c9542bd87a627 (diff) | |
| parent | e81e450ed1cee2aaf86043ac2931ef2af7ff46e0 (diff) | |
[automerger skipped] [conflict] Merge "Enable secondary_user_on_secondary_display for CtsPermissionUiTestCases" into android15-tests-dev am: 6d67f04d50 am: c84e1cc258 am: e81e450ed1 -s ours
am skip reason: Merged-In I583163a2be2c3476d02d2357a93a9e26d8ba3bb9 with SHA-1 ede8f8fb78 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/30768497
Change-Id: Ibc237cebd8be55e51c7df6b7a68d6b73b8069445
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions