diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-10-08 11:10:14 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-10-08 11:10:14 +0000 |
| commit | 1170e707b7672642aadaf8103829a783713ae487 (patch) | |
| tree | 37aaa487cff884ba8b4ac1ec07c1c73516f86d27 /src/android/templates | |
| parent | 29208fa07c1b9f656ea2535696828385b7832226 (diff) | |
| parent | b4da5c6b931fb726fade891448f01c266cb3c115 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.11' into 5.12" into refs/staging/5.12
Diffstat (limited to 'src/android/templates')
0 files changed, 0 insertions, 0 deletions