diff options
| author | 2023-07-27 00:31:11 +0000 | |
|---|---|---|
| committer | 2023-07-27 00:31:11 +0000 | |
| commit | 4754284f015fd7f0e801564f906c2d9e4337c7ca (patch) | |
| tree | 956e27449e69b6c634316cb7b16b04c074d338c4 /libs/androidfw/StringPool.cpp | |
| parent | f81ceadead5e98c7aea36b6ddafbf9d57de79fb7 (diff) | |
| parent | ed04c8f63b132a96198d288e14228b9eb82312ca (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: 27fa09dcd1 -s ours am: ed04c8f63b -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: I7c685dc74c52249c6200732f71e8f329f13272b6
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