mozilla-b2g/gaia — pull request #14013 by AndreiH (2013-11-25 13:00:28+00:00)
Title: Bug 941727 - Fix up test_unlock_to_camera

Conflicts:
tests/python/gaia-ui-tests/gaiatest/tests/functional/lockscreen/test_lockscreen_unlock_to_camera_with_passcode.py