diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-01 12:46:28 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-01 12:46:28 +0200 |
| commit | 703ee3879bf055787f2219f5b2212053d9535fe9 (patch) | |
| tree | 6c5c19c862914e3585b0be8eec41a0a7ec5c674a /src/plugins/android/src/mediacapture/qandroidcamerasession.cpp | |
| parent | c9a3bbc3e69b9965b5c1b9d85f8426896f94c02a (diff) | |
| parent | 82d96105cea1bca034119adf54a2614c67a24c13 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I900412b4c6f894dec27b8158d498b2ff18404ced
Diffstat (limited to 'src/plugins/android/src/mediacapture/qandroidcamerasession.cpp')
0 files changed, 0 insertions, 0 deletions