Bug 870148 - Follow up, fix broken rebase. a=leo+
Bug 867913 - SimplePush: Monitor for active network change on B2G. r=jlebar a=akeybl
Merge b2g18 to v1.1hd. a=merge