summaryrefslogtreecommitdiff
path: root/src/plugins/android/src/mediacapture/qandroidcamerasession.h
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-04-17 10:33:57 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-04-17 10:33:57 +0200
commit21f752806077e05249f9c357f14e9f0294920ecb (patch)
treeac8283d43af2a6ece7c08a693c67ffb47a305333 /src/plugins/android/src/mediacapture/qandroidcamerasession.h
parentc8716f68feb5a38473cbd54972b9a9f095e9e24d (diff)
parentc7e735198c6cc01201f90b64c8a6d35fc40584fc (diff)
downloadqtmultimedia-21f752806077e05249f9c357f14e9f0294920ecb.tar.gz
Merge remote-tracking branch 'origin/5.12.3' into 5.12
Change-Id: Iba6e8b9c44b6fc83ec69ad7a922135a35564de8d
Diffstat (limited to 'src/plugins/android/src/mediacapture/qandroidcamerasession.h')
0 files changed, 0 insertions, 0 deletions