diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:23:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:23:21 +0200 |
| commit | d32aff3e0453475c1a22d5e8c7a106df18c0ad10 (patch) | |
| tree | e547f0d8b6174e227add827a9143f5f7ef1d2fe3 /src/plugins/android/src/qandroidmediaserviceplugin.cpp | |
| parent | b26003419f054722c16cfc9bc3b4366261543bff (diff) | |
| parent | c8eed01f1ffe5ad03a82d0bb7c49b71d5cec09b3 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I7de78c63b5f81620474c69e5c651202c553a70d7
Diffstat (limited to 'src/plugins/android/src/qandroidmediaserviceplugin.cpp')
0 files changed, 0 insertions, 0 deletions