OSDN Git Service

Merge "Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen...
authorJim Miller <jaggies@google.com>
Wed, 9 Nov 2011 23:19:31 +0000 (15:19 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 9 Nov 2011 23:19:31 +0000 (15:19 -0800)
commit8e540328fc524727c6ced05c2a3450c85f6cbdbe
treef1479a9eec2a5ca05d7b9bdabe4cff6604d4a85b
parent36fa0af67c728efa091536fa2c0cf930c72a9fad
parentf4a9a39b0b5466ec40576ff2c4971d637573644a
Merge "Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen" into ics-mr1