[Merge] lp:~phablet-team/network-manager/lp1361864 into lp:~phablet-team/network-manager/vivid-phone-overlay

[Tony Espy]

Re-submitted at https://code.launchpad.net/~phablet-team/network-manager/lp1361864-2/+merge/263982.

Changing the status of this merge to 'Rejected'.
-- 
https://code.launchpad.net/~phablet-team/network-manager/lp1361864/+merge/263855
Your team Ubuntu Phablet Team is subscribed to branch lp:~phablet-team/network-manager/vivid-phone-overlay.