diff options
| author | 2023-07-28 18:51:33 +0000 | |
|---|---|---|
| committer | 2023-07-28 18:51:33 +0000 | |
| commit | 7e3a40a87facfa6d957972c21c305dcdb09dcf4e (patch) | |
| tree | 9f734c0072d66606edb3390052487f44b8d3b02c /native/android/configuration.cpp | |
| parent | dd4737e7a99ca84c88d63939bc94cf9b657fbbc7 (diff) | |
| parent | 82e79d334f742c0752149f65bba176044dc4b433 (diff) | |
Merge changes from topic "am-48a3c3eac6a54d63aeb7abdb330441b0" into udc-d1-dev-plus-aosp
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: f4cf2434cc -s ours am: 4215a509a8 -s ours am: 125f50a150 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ecf4015032 -s ours am: fbb494fb5c -s ours am: 6ed6575987 -s ours
Diffstat (limited to 'native/android/configuration.cpp')
0 files changed, 0 insertions, 0 deletions