[Merge] lp:~mathieu-tl/ofono/conflicts into lp:~phablet-team/ofono/ubuntu

[noreply at launchpad.net]

The proposal to merge lp:~mathieu-tl/ofono/conflicts into lp:~phablet-team/ofono/ubuntu has been updated.

    Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~mathieu-tl/ofono/conflicts/+merge/221366
-- 
https://code.launchpad.net/~mathieu-tl/ofono/conflicts/+merge/221366
Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~mathieu-tl/ofono/conflicts into lp:~phablet-team/ofono/ubuntu.