| commit | c31978655df7d1025ca58c3b7447949acf7a35cd | [log] [tgz] |
|---|---|---|
| author | Hongwei Wang <hwwang@google.com> | Thu Jul 27 01:20:54 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 27 01:20:54 2023 +0000 |
| tree | d32f525a6438575e27d4ff400080b5eb7727f1cd | |
| parent | c6bdea44ac8973c9a5ed5eb7fa83e9e32d30d690 [diff] | |
| parent | 728219a5b53a8574fc634cd7201b376c693bfe5a [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: a83ed7318c -s ours am: d10ccc376d -s ours am: 728219a5b5 -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: I9a037e53e5f8be386b899f95aa1526f571d6f51c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>