summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author Yuri Lin <yurilin@google.com> 2023-02-23 22:56:20 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-02-23 22:56:20 +0000
commit6c7df079fe0ec953a69aff1ea39457139511c9f5 (patch)
treece22e65368f15c134a5eee966cd441dbda58ba3d /libs/androidfw/ApkParsing.cpp
parent9dbf552c871c9ada1c9c92bd52d4633965bea68b (diff)
parent7ae3e05b4da95e660dd2344760a9be06dacfd484 (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: f91f191970 -s ours am: 7ae3e05b4d -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: I130f2d8a8a31a6708f6cc6a5414b9fb41f33b4bf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ApkParsing.cpp')
0 files changed, 0 insertions, 0 deletions