diff options
| author | 2023-05-31 20:28:01 +0000 | |
|---|---|---|
| committer | 2023-05-31 20:28:01 +0000 | |
| commit | 6ea790a9a24b84036b9e709faac70c30755052b3 (patch) | |
| tree | 0fa4da1ab6cf3f166368745a7bd0cff8b51362a9 /libs/androidfw/ApkParsing.cpp | |
| parent | b236d4d9a2cfb0d5c3e9050c7f1d76bdd2f5f973 (diff) | |
| parent | f4dd59b0989eacee9bb89478dba85fd645946113 (diff) | |
Merge changes from topic "am-b6907c13d4c64147af79f09d46c90a0d" into udc-d1-dev-plus-aosp
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 59d24c1dce -s ours am: 2257e5fbcb -s ours am: a54bfe1120 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35b32b6138 -s ours am: 89e2d1e0c3 -s ours am: 11db909958 -s ours
Diffstat (limited to 'libs/androidfw/ApkParsing.cpp')
0 files changed, 0 insertions, 0 deletions