summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Hongwei Wang <hwwang@google.com> 2023-07-26 01:45:28 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-26 01:45:28 +0000
commit573444b8207d52c5fe10a1230263b1b88fb59f08 (patch)
treec258e746d0f21241b3bef6e916cdab7f92167e9f /libs/androidfw/StringPool.cpp
parent2b8e18562f7345fcb1ac8c258519a7c5d66c4fca (diff)
parent8097e32971896e66720d2d2c983817264ad713ea (diff)
[automerger skipped] Merge "Disallow loading icon from content URI to PipMenu" into tm-dev am: b986ddc460 am: 59ad018804 am: 3ed142fe97 -s ours am: f000df9fb6 -s ours am: 8097e32971 -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/+/23436487 Change-Id: Ib9b2537631e1930c09ab3ba634ef014b5507470c 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