Merge "Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen" into ics-mr1

This commit is contained in:
Jim Miller 2011-11-09 15:19:31 -08:00 committed by Android (Google) Code Review
commit 8e540328fc

Diff Content Not Available