summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/android
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-04-15 01:00:18 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-04-15 01:00:18 +0200
commit4aa6f54fec9d199f97759945118451c52767b2ce (patch)
tree5dc695cd4718437b5015aaef3a02463c61bc5dc2 /src/plugins/platforms/android
parent369e7572bac94bb5b83ef881012fdc4a86829496 (diff)
parentd5ac11891d8237ca2f02390ffd0ff103578b520e (diff)
Merge remote-tracking branch 'origin/5.11' into dev
Diffstat (limited to 'src/plugins/platforms/android')
0 files changed, 0 insertions, 0 deletions