| commit | fa10d780de516c552e2f708d112f862df319f4be | [log] [tgz] |
|---|---|---|
| author | Hongwei Wang <hwwang@google.com> | Thu Jul 27 22:56:51 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 27 22:56:51 2023 +0000 |
| tree | b1233d35d0a96a0068654128b2956ce909a21890 | |
| parent | 0fbf93b9f60cab757cf1e6c2a6bcc0e861ba8f1a [diff] | |
| parent | 5bc9e9288e7f1b93ab90ebc28ef65f56d677cbe1 [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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24228701 Change-Id: I021f4969f9d76d6aa22fda4f672fb8530f352df6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>