diff options
| author | 2022-08-23 06:57:05 +0000 | |
|---|---|---|
| committer | 2022-08-23 06:57:05 +0000 | |
| commit | f1996e23066829f72e47b5412a33b104dc4897b9 (patch) | |
| tree | 063867f59e7a987bc1fdab4d5654381c93367f2d /libs/androidfw/ResourceTimer.cpp | |
| parent | 5dca1214196649da3db9ef22b2445e9afd31972d (diff) | |
| parent | 16e83680e0e9c9dd36207fd22183d9fca2fd9a5d (diff) | |
Merge changes from topic "am-7afe9ccdf6704414907a3cd3d365cc20"
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 007c203c32 -s ours am: 8959a05af8 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fa68238395 -s ours am: 4840a77a78 -s ours
Diffstat (limited to 'libs/androidfw/ResourceTimer.cpp')
0 files changed, 0 insertions, 0 deletions