mozilla-b2g/gaia — pull request #12878 by snowmantw (2013-10-16 08:03:06+00:00)
Title: [LockScreen] Merge two v1.2 approval patches.

Include two patches:
1. Bug 925635
2. Bug 923788