mozilla-b2g/gaia — pull request #15733 by AndreiH (2014-01-27 16:23:22+00:00)
Title: Bug 962504 - Investigate intermittent fail on test_cost_control_reset_wi...

...fi

Conflicts:
tests/python/gaia-ui-tests/gaiatest/tests/functional/cost_control/test_cost_control_reset_wifi.py