diff options
| author | 2023-05-31 18:26:44 +0000 | |
|---|---|---|
| committer | 2023-05-31 18:26:44 +0000 | |
| commit | a8e6420899da4a67c4be154dc1dbe445f1204306 (patch) | |
| tree | d49165b35826d91bcded61b2ac271d0e17d1f630 /libs/androidfw/ApkParsing.cpp | |
| parent | 3115d189ddb0d41692a123e1ed9ea5ed0e29b0f4 (diff) | |
| parent | 890be51f04797887e66524b5e0eb9e10023cf878 (diff) | |
Merge changes from topic "am-690a757853224cf3afc67ab6aa353037" into udc-dev
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: f57be30f34 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7726415d26 -s ours
Diffstat (limited to 'libs/androidfw/ApkParsing.cpp')
0 files changed, 0 insertions, 0 deletions