diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-26 03:02:10 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-26 03:02:11 +0200 |
commit | 71e2096c2b704420cbb0ee836c16565b658b3d0f (patch) | |
tree | 95f94c252437cdf3fb6788a449ed9e0a24ad9b98 /src/plugins/android/src/mediacapture/qandroidcamerasession.cpp | |
parent | 65488e1d950f8af5662aff931b68f46774ef7801 (diff) | |
parent | 4b99c0e0474da438e8b3e978dc84c2fb9880f6ce (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I742809ff57da23390b36c60d508b213910dad15c
Diffstat (limited to 'src/plugins/android/src/mediacapture/qandroidcamerasession.cpp')
0 files changed, 0 insertions, 0 deletions