diff options
| author | 2023-07-27 03:23:26 +0000 | |
|---|---|---|
| committer | 2023-07-27 03:23:26 +0000 | |
| commit | c254a58977dc69502f62cc43171500f66b03ed34 (patch) | |
| tree | 5504befb4f16441ec193cee1534b4cb62a90b13c /libs/androidfw/StringPool.cpp | |
| parent | 23546c4a7906b3009a3c0da481e088f7a3edf993 (diff) | |
| parent | a5f2ae4685bf40a3052dc729d2b99a4b375ae734 (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: d887493143 -s ours am: 18f4b1f045 -s ours am: a5f2ae4685 -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: Id1084a0d124661abd424255ddbf22e26b6f7d6df
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