| commit | a83ed7318cb776325f835b25b6855f88f51f31c6 | [log] [tgz] |
|---|---|---|
| author | Hongwei Wang <hwwang@google.com> | Wed Jul 26 23:45:59 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jul 26 23:45:59 2023 +0000 |
| tree | a6fe47a8975a91a73e5413822d5a103748d485fa | |
| parent | 15bd5fcb78dda0f3ecec8a75ea07ee9c9296e20e [diff] | |
| parent | aa0362b18f5e01591b004134d4ce5a1081d4e9d5 [diff] |
[automerger skipped] Merge "Disallow loading icon from content URI to PipMenu" into sc-dev am: 1f2e080f1b am: 0fbf93b9f6 am: 31262f43e4 -s ours am: 9c653875b2 -s ours am: aa0362b18f -s ours am skip reason: Merged-In Ib3f5b8b6b9ce644fdf1173548d9078e4d969ae2e with SHA-1 1aee65603e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23423703 Change-Id: I1fcdf63f0c30a4149a61c8d0c47e2be57a675ba0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>