summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Yuri Lin <yurilin@google.com> 2022-09-23 07:36:50 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-23 07:36:50 +0000
commit8a44e5c96d2be255ea1a5f17baf8678f85861062 (patch)
tree53151253097a7d9d5b8bf3d72b30650c74d851aa /libs/androidfw/StringPool.cpp
parentd6d4088a0b440d7a12d0f3a23531f543459a3872 (diff)
parentb7c57ffd04ced5cb859edcf59d22f96765c6ebb6 (diff)
[automerger skipped] Merge "Limit lengths of fields in Condition to a max length." into qt-dev am: da63d3e028 am: 32dfdfc4b7 -s ours am: 8b8e224019 -s ours am: a11ecd6e0f -s ours am: 347cd30b49 -s ours am: 3a115083a2 -s ours am: 0e9b5961c3 -s ours am: dddcfbfc7d -s ours am: 46d6df4c30 -s ours am: 8b951203c9 -s ours am: b7c57ffd04 -s ours
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 80c0fcf06d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19970324 Change-Id: I04a1d5bb6ee29636854968aa54232d3a71263d12 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