diff options
| author | 2023-07-27 03:23:06 +0000 | |
|---|---|---|
| committer | 2023-07-27 03:23:06 +0000 | |
| commit | 23546c4a7906b3009a3c0da481e088f7a3edf993 (patch) | |
| tree | 5504befb4f16441ec193cee1534b4cb62a90b13c /libs/androidfw/StringPool.cpp | |
| parent | 41302fdba05d1850c4e48a1ca831c133e7de1ea4 (diff) | |
| parent | faa0f4be0cc1b3747a202cd7cd83f322089d3b33 (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: aa0362b18f -s ours am: a83ed7318c -s ours am: d10ccc376d -s ours am: 728219a5b5 -s ours" into udc-d1-dev-plus-aosp am: e2be62caa6 -s ours am: faa0f4be0c -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: I746003b9d07562d236d0b9d4617832ab65e65677
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