Bug 826398 Importing Facebook contacts times out in 2G Edge
Bug 827383 - The lockscreen doesn't show a pop up to unlock the phone using network control key when network depersonalization has been activated. r=ochameau
Merge pull request #7476 from jmcanterafonseca/fb_timeouts

Bug 826398 Importing Facebook contacts times out in 2G Edge
Merge pull request #7462 from jaoo/827383

[Bug 827383] The lockscreen doesn't show a pop up to unlock the phone us... r=ochameau
Auto-merge from branch 'master'