diff options
| author | 2023-09-08 01:14:45 +0000 | |
|---|---|---|
| committer | 2023-09-08 01:14:45 +0000 | |
| commit | 43704ead82fad525bc53e494a5ea2a586f064772 (patch) | |
| tree | 14dd44b077faae645ddf71b9213c4acc4170fc6f /libs/androidfw/ObbFile.cpp | |
| parent | ccf173a0dc1617d0926e608d8140421c128bb13a (diff) | |
| parent | 20ed96398053477dd4cd0c609e070680d57f0566 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 7d416cbee7 -s ours am: 3a3c4c6724 -s ours am: 20ed963980 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24695029
Change-Id: I62b74f69f44b6fb7f12a6aa53c187c75b44e535c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions