summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Kiran Ramachandra <kiranmr@google.com> 2024-06-21 17:05:13 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-06-21 17:05:13 +0000
commit97074aaeea799be96ea5c61ef00e991192820780 (patch)
tree4b67edcbdd831c41e36ef0f67cd67f858e9096b0 /libs/androidfw/StringPool.cpp
parent2eed351c575f9b2bafd3bf1f0cab2c3d92cecab9 (diff)
parentfb47a80bee786b45722851a224bb50c394623c43 (diff)
[automerger skipped] Merge "DO NOT MERGE Ignore - Sanitized uri scheme by removing scheme delimiter" into sc-v2-dev am: 19a2731fd2 -s ours am: 338f22f4c3 -s ours am: 54f55363ea -s ours am: 4222164500 -s ours am: fb47a80bee -s ours
am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27631820 Change-Id: Ia49ad50a85386133d9abf3fe315d28c4dec5026e 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