| commit | 60fdd48f2b1976a70840d63bcf03f9e78b3d6438 | [log] [tgz] |
|---|---|---|
| author | Hongwei Wang <hwwang@google.com> | Fri Jul 28 08:15:44 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 28 08:15:44 2023 +0000 |
| tree | 1317e965a26c88753246aa68d5c4a18a4f8a2112 | |
| parent | 5fd67137c68c7fd8bce209957b0a1087bc284cd4 [diff] | |
| parent | 5fb26cd6bcd92a2d211f0a2149f9d8c6f96490da [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: 5904480a8a -s ours am: d47040b736 -s ours am: 5fb26cd6bc -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24228701 Change-Id: I156788479bd6889468762d6165fb4237cf4c0e79 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>