diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-17 10:33:57 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-17 10:33:57 +0200 |
commit | 21f752806077e05249f9c357f14e9f0294920ecb (patch) | |
tree | ac8283d43af2a6ece7c08a693c67ffb47a305333 /src/plugins/android/src/mediacapture/qandroidcamerasession.h | |
parent | c8716f68feb5a38473cbd54972b9a9f095e9e24d (diff) | |
parent | c7e735198c6cc01201f90b64c8a6d35fc40584fc (diff) | |
download | qtmultimedia-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