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

Browse Source

* commit '5943c1dc406574b360e9cb1343a5dab00a84a8e2':
  Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen

...

This commit is contained in:

Jim Miller 2011-11-10 16:15:14 +00:00 committed by Android Git Automerger

parent 6f2eae3e37 f795a58c90

commit 46c8dbad85

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available