commit | 8e540328fc524727c6ced05c2a3450c85f6cbdbe | [log] [tgz] |
---|---|---|
author | Jim Miller <jaggies@google.com> | Wed Nov 09 15:19:31 2011 -0800 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Nov 09 15:19:31 2011 -0800 |
tree | f1479a9eec2a5ca05d7b9bdabe4cff6604d4a85b | |
parent | 36fa0af67c728efa091536fa2c0cf930c72a9fad [diff] | |
parent | f4a9a39b0b5466ec40576ff2c4971d637573644a [diff] |
Merge "Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen" into ics-mr1