summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Yuri Lin <yurilin@google.com> 2022-09-22 21:27:26 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-22 21:27:26 +0000
commit83fd56b729f81c1c2f6eb29dbd0b9d9bccdef117 (patch)
tree9f306594f5ba91b565519a6f2b7ae6781ba721fa /libs/androidfw/StringPool.cpp
parentd1b137a8ddd0a9acf61dc60429a4bd932b3944e6 (diff)
parent2c42836657e92776ff7aea4316a6f4e09b28ce87 (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: 105990d1fa -s ours am: 2c42836657 -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: Ie0753be3763f8c6b91cf490d4508c1b195f24d51 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