diff options
| author | 2022-02-24 02:53:26 +0000 | |
|---|---|---|
| committer | 2022-02-24 02:53:26 +0000 | |
| commit | 629b6946635cd39a83e2138c9545f831cd9b084e (patch) | |
| tree | 1ad61ec6837d34df05898dc6b4d4a74ed2f2e19e /libs/androidfw/AssetsProvider.cpp | |
| parent | 31e2d988aa2f5184a29c3bdc867993da664dc285 (diff) | |
| parent | fd6887d1f6e5445f7b23b56930699423098ee707 (diff) | |
Merge changes from topic "am-4c5f537596ec4c2880fcaaf62e125f68" into tm-dev
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 7dab4a6ffc -s ours am: eea0986ff5 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 95a1ea0a49 -s ours am: 6791de1e2f -s ours
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions