summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-07-27 21:59:29 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-27 21:59:29 +0000
commit4af611438ef3c54d60cf077f57b08b00722a1685 (patch)
treec961bc4c26127315e4d3de1cab0a19a113380f30 /libs/androidfw/ApkParsing.cpp
parent49a2b0165af63b483b001990642c3f54dfc0adc9 (diff)
parent8887f3e2ce3abe7d1f7a0be453188f1d89fee8ae (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 97aefb2953 -s ours am: e6285b18b7 -s ours am: 80fe3593bd -s ours am: 8887f3e2ce -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24215317 Change-Id: I1137bb87b5ea9c3e935a21a936a3b28f29ae8f8e 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