[Merge] lp:~vorlon/ubuntu/saucy/lxc-android-config/nm-divert into lp:ubuntu/lxc-android-config

[Ricardo Salveti]

Review: Approve

Looks good, tested with mako and maguro after a clean flash and worked as expected (could enable a connection, change between aps, disable/enable wifi, etc).
-- 
https://code.launchpad.net/~vorlon/ubuntu/saucy/lxc-android-config/nm-divert/+merge/178308
Your team Ubuntu branches is subscribed to branch lp:ubuntu/lxc-android-config.