[Merge] lp:~phablet-team/qtubuntu-media/wily-sync into lp:qtubuntu-media

[Alfonso Sanchez-Beato]

The proposal to merge lp:~phablet-team/qtubuntu-media/wily-sync into lp:qtubuntu-media has been updated.

Commit Message changed to:

* [ Alfonso Sanchez-Beato ] Make sure the that the current player 
  instance is controlable by MPRIS controls if the type of player is 
  appropriate for playlist control. Also, don't add a track to the 
  tracklist when
  AalMediaPlayerService::setMedia() is called. (LP: #1500859)
* [ Jim Hodapp ] Make sure the that the current player instance is
  controlable by MPRIS controls if the type of player is appropriate for
  playlist control. Also, don't add a track to the tracklist when
  AalMediaPlayerService::setMedia() is called. (LP: #1500859)

For more details, see:
https://code.launchpad.net/~phablet-team/qtubuntu-media/wily-sync/+merge/274681
-- 
Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~phablet-team/qtubuntu-media/wily-sync into lp:qtubuntu-media.