Jim Miller d9147aad5e 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

2011-11-09 23:24:07 +00:00

..

src/com/android/internal/policy/impl

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

2011-11-09 23:24:07 +00:00

tests

…

Android.mk

…