diff options
| author | 2024-07-09 18:05:46 +0000 | |
|---|---|---|
| committer | 2024-07-09 18:05:46 +0000 | |
| commit | 5c248863da8c8709420a8eebd8214cea94dfbfb3 (patch) | |
| tree | 1ecfe494749d48fc7cc619216739449baa83b201 /tools/aapt2/ResourceParser.cpp | |
| parent | 0ef7f4387f3a916a6cadf367163e01944336e9ce (diff) | |
| parent | 450150ea19fd57b8283efed7ba8786e7b9fc247e (diff) | |
Merge changes from topic "am-370834c2babf48d884c7a5fbcfbe2dde" into main
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: e28afeb754 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eb8b767d6c -s ours
Diffstat (limited to 'tools/aapt2/ResourceParser.cpp')
0 files changed, 0 insertions, 0 deletions