mozilla-b2g/gaia — pull request #11620 by mcirlanaru (2013-08-19 22:58:57+00:00)
Title: Bug 899236  - [Lockscreen] Reintroduce passcode screen camera button [v1-train uplift]

This PR fixes the uplift conflicts of 86d7d11b4637977b4131845b311e4348fb42d131