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