summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Hongwei Wang <hwwang@google.com> 2023-07-26 01:44:53 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-26 01:44:53 +0000
commit2b8e18562f7345fcb1ac8c258519a7c5d66c4fca (patch)
treec258e746d0f21241b3bef6e916cdab7f92167e9f /libs/androidfw/StringPool.cpp
parent7d9ba800995b4d895dd1f39a541dbfdc60de5feb (diff)
parentca699ccf768862ccea6ef500fde1e23577f94dcf (diff)
[automerger skipped] Merge "Disallow loading icon from content URI to PipMenu" into tm-dev am: b986ddc460 am: 8ffe0b3304 -s ours am: 638e85c8bf -s ours am: ca699ccf76 -s ours
am skip reason: Merged-In Ib3f5b8b6b9ce644fdf1173548d9078e4d969ae2e with SHA-1 6b230c82a1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23436487 Change-Id: I18b5b18deaf15b478e190950e2b37426cc8544a5 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