[Merge] lp:~phablet-team/ofono/system-settings into lp:~phablet-team/ofono/ubuntu

[Tony Espy]

Review: Needs Fixing

Please indicate in the changelog what new rilmodem tests were added.

Also, wondering why the file src/wakelock.c shows up as "added" and then "removed" in the patch?

-- 
https://code.launchpad.net/~phablet-team/ofono/system-settings/+merge/288493
Your team Ubuntu Phablet Team is subscribed to branch lp:~phablet-team/ofono/ubuntu.