| commit | 524a0adeb55885520a5fec1aa152d0049ec96345 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Thu Nov 10 16:15:14 2011 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 10 16:15:14 2011 +0000 |
| tree | b58001094d9ee4b375dc4e3f904cae24c595adcd | |
| parent | 94eb3823445e894b9a406bdcddee5dbe7a9f9531 [diff] | |
| parent | 5943c1dc406574b360e9cb1343a5dab00a84a8e2 [diff] |
am 5943c1dc: am 270826a8: Merge "Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen" into ics-mr1 * commit '5943c1dc406574b360e9cb1343a5dab00a84a8e2': Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen