diff options
| author | 2023-07-28 18:25:00 +0000 | |
|---|---|---|
| committer | 2023-07-28 18:25:00 +0000 | |
| commit | 197708eef0eb127d968dd3e436ee1166881554ad (patch) | |
| tree | 1317e965a26c88753246aa68d5c4a18a4f8a2112 /wifi/java/src | |
| parent | 125f50a150e1308e1347af3dc61a4494c9b9423d (diff) | |
| parent | b88b69143664571fb2d4ef2924d270d57894f62b (diff) | |
[automerger skipped] [DO NOT MERGE][conflict] Merge "Disallow loading icon from content URI to PipMenu" into rvc-dev am: 5d31bd1c3b am: 8451e9a0c7 -s ours am: 5bc9e9288e -s ours am: fa10d780de -s ours am: 08dd2ef76b -s ours am: 7d2065df8a -s ours am: 6fc3dee289 -s ours am: b88b691436 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24228701
Change-Id: I310c265db510fef260c63228a476af0e72a8b715
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'wifi/java/src')
0 files changed, 0 insertions, 0 deletions