diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-01 09:13:55 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-01 09:13:55 +0200 |
| commit | 85aadf8cb2f7125ae7457b78943d3486bd2d2133 (patch) | |
| tree | 1c1819eac09ad1299e6c46e8395ae5f7ace7b8e6 /src/plugins/android/src/mediaplayer/qandroidmediaservice.h | |
| parent | 957084ac1b1a1e144ce24d3884c3b01320e92fca (diff) | |
| parent | 5e83f0927c94a0c7244886d308fc0eac133b9ea3 (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/plugins/android/src/mediaplayer/qandroidmediaservice.h')
0 files changed, 0 insertions, 0 deletions