| commit | 5943c1dc406574b360e9cb1343a5dab00a84a8e2 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Wed Nov 09 23:21:39 2011 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 09 23:21:39 2011 +0000 |
| tree | 3268e5f0312f4b184fe73073cce08af4e9b310f9 | |
| parent | bf3f6f42775910544b9292ac1eb8bcdf1d1696d3 [diff] | |
| parent | 270826a8878b5470d48d93ca3d518ac93860870d [diff] |
am 270826a8: Merge "Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen" into ics-mr1 * commit '270826a8878b5470d48d93ca3d518ac93860870d': Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen