diff options
| author | 2023-07-27 01:19:47 +0000 | |
|---|---|---|
| committer | 2023-07-27 01:19:47 +0000 | |
| commit | b51060070768c5aaba27cc9d2cb88459fdb5722b (patch) | |
| tree | db28e6b59da1ee8f49c7559500b86014099eaf83 /libs/androidfw/StringPool.cpp | |
| parent | f74901b8249dff950a556b027d4794bc8cb9dd04 (diff) | |
| parent | 83c408cba0d323eb595b9c66bfb037b35ef595e6 (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: 83c408cba0 -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: Ibdc15d23e11e12b0bc518b6d0658027296a03816
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