diff options
| author | 2023-09-08 01:14:16 +0000 | |
|---|---|---|
| committer | 2023-09-08 01:14:16 +0000 | |
| commit | 6e49fbf149c350b65abf4ac8ab26552a4fe95744 (patch) | |
| tree | 14dd44b077faae645ddf71b9213c4acc4170fc6f /libs/androidfw/ObbFile.cpp | |
| parent | 66cdd4d7a127d9b544eaf8f8c21ff0159a1fa046 (diff) | |
| parent | 6c1ae62f1b737c11639f67349fa6db1a10ade170 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 4b01426ab0 -s ours am: 358a9d0714 -s ours am: 6c1ae62f1b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24694759
Change-Id: I1e324ae58446ecd0e9c70513cbc1cf36900e8905
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