diff options
| author | 2023-07-27 03:21:45 +0000 | |
|---|---|---|
| committer | 2023-07-27 03:21:45 +0000 | |
| commit | f81badf54958f4dbf596e695696987a20b60590e (patch) | |
| tree | 5504befb4f16441ec193cee1534b4cb62a90b13c /libs/androidfw/StringPool.cpp | |
| parent | a067192f21968c7acb9f0a6d422b3034ee60b9c4 (diff) | |
| parent | 7a5e186f5d665612ee2d3ffc558bb99d0e7019ec (diff) | |
Merge "[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: 470bd60d93 -s ours" into udc-d1-dev-plus-aosp am: 6285ca17f5 -s ours am: 7a5e186f5d -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: Ib8d6d199d002d267af2a38c08a4d32189163304e
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