diff options
| author | 2023-07-27 22:57:49 +0000 | |
|---|---|---|
| committer | 2023-07-27 22:57:49 +0000 | |
| commit | 16c4f90ca80314ce841323483c9947e33cb8c0bc (patch) | |
| tree | c961bc4c26127315e4d3de1cab0a19a113380f30 /libs/androidfw/ApkParsing.cpp | |
| parent | ec9ea091c7ec9e883c35049c8433863b97740dcd (diff) | |
| parent | aac805263733cf6636a73d70e2565cba9c384d76 (diff) | |
Merge changes from topic "am-9fe6d585c59b417b8e8bc508f2bb8cf7" into udc-qpr-dev-plus-aosp
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: e059d7071b -s ours am: f5156a471e -s ours am: 604ebda5b2 -s ours am: a98d1de6d8 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a25bc17164 -s ours am: 0c737516d6 -s ours am: 69d8a2da55 -s ours am: 4bbf95a9d2 -s ours
Diffstat (limited to 'libs/androidfw/ApkParsing.cpp')
0 files changed, 0 insertions, 0 deletions