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