diff options
| author | 2023-07-27 01:20:14 +0000 | |
|---|---|---|
| committer | 2023-07-27 01:20:14 +0000 | |
| commit | 6f7379bb1ad1fac90905d6c9e8ae325140de5c9c (patch) | |
| tree | db28e6b59da1ee8f49c7559500b86014099eaf83 /libs/androidfw/StringPool.cpp | |
| parent | b51060070768c5aaba27cc9d2cb88459fdb5722b (diff) | |
| parent | d6e2feca4233384c6d38add660b65ea5dc5f2cd0 (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: d6e2feca42 -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: I7325365378bebb21b0423a5efa34109e5a03f25b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions