am 5943c1dc: am 270826a8: Merge "Fix 5555408: allow emergency button to be...
am 5943c1dc: am 270826a8: Merge "Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen" into ics-mr1
* commit '5943c1dc':
Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen