mozilla-b2g/gaia — pull request #17185 by leonazhao (2014-03-14 09:41:33+00:00)
Title: Bug 858017 - [COST CONTROL] Use Gecko native support for data usage alar...

...ms provided by NetworkStats API 2.0

Conflicts:

apps/costcontrol/js/message_handler.js
apps/costcontrol/test/unit/cost_control_test.js
apps/system/js/cost_control.js