mozilla-b2g/gaia — pull request #9149 by mcirlanaru (2013-04-12 15:51:40+00:00)
Title: Merge pull request #8967 from mcirlanaru/bug_835972

Bug 835972 - Display SIM PIN dialog (if SIM card locked) for apps that ...(cherry picked from commit b126eeb39ed9bfa1e5662386f74611d5d6527b18)

Conflicts:

apps/system/js/sim_lock.js