[Merge] lp:~morphis/ubuntu-touch-session/change-droid-conf into lp:ubuntu-touch-session

[Simon Fels]

The proposal to merge lp:~morphis/ubuntu-touch-session/change-droid-conf into lp:ubuntu-touch-session has been updated.

Commit Message changed to:

Load the droid discovery module which will load the right card module
depending on the Android platform we're running on.

For more details, see:
https://code.launchpad.net/~morphis/ubuntu-touch-session/change-droid-conf/+merge/282562
-- 
Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~morphis/ubuntu-touch-session/change-droid-conf into lp:ubuntu-touch-session.