mozilla-b2g/gaia — pull request #21378 by alivedise (2014-07-04 06:07:16+00:00)
Title: Bug 1030415 - Use lockscreen-request-unlock to show homescreen or app

Conflicts:
apps/system/js/visibility_manager.js
apps/system/test/unit/visibility_manager_test.js