summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author Bill Yi <byi@google.com> 2023-08-31 21:02:50 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-31 21:02:50 +0000
commit39707345e81d3dffb2fe0c38fc327d11c2eae6b2 (patch)
treef032bce46f62e9941a83650df8848ea68b8597c9 /libs/androidfw/ApkParsing.cpp
parent169519b2b8cce9af0599cb9e09c80cd6d64b2f60 (diff)
parentcc232e427767ff0143cc88a3f1b000d6c4c9ad6b (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: cc232e4277 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24616620 Change-Id: I166893823e942c076f1a9627687235fa6e1256e2 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