diff options
| author | 2023-09-08 01:14:56 +0000 | |
|---|---|---|
| committer | 2023-09-08 01:14:56 +0000 | |
| commit | ea8c73b44ed8f9c825bdc04d61a1000fd194b951 (patch) | |
| tree | 14dd44b077faae645ddf71b9213c4acc4170fc6f /libs/androidfw/ApkParsing.cpp | |
| parent | 1422e61fa8245906c1989e5a4f1dd34e95611f03 (diff) | |
| parent | 05c4a4a09e45ca7116968c85558fd129f3b6f2b6 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: d79ee3e7e3 -s ours am: 6ca844a273 -s ours am: 05c4a4a09e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24695031
Change-Id: I162e8d4ab822aadb5cd948ba4b4ca8d5b86bb679
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