| commit | 7d2065df8a315a4def4b4c210f40b721f928ae4d | [log] [tgz] |
|---|---|---|
| author | Hongwei Wang <hwwang@google.com> | Fri Jul 28 00:50:17 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 28 00:50:17 2023 +0000 |
| tree | e766f149e3fd7e96c985320f1598967fa86f5cb1 | |
| parent | 9c653875b2bc384c42f698021fedc8f3c889ff81 [diff] | |
| parent | 08dd2ef76bc5137e64c8e8ba19e6c8ea12d3d102 [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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24228701 Change-Id: Iecc791593b8636e59603c069c4d6d08f603b1260 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>