OSDN Git Service

am 270826a8: Merge "Fix 5555408: allow emergency button to be disabled on SIM/PUK...
authorJim Miller <jaggies@google.com>
Wed, 9 Nov 2011 23:21:39 +0000 (23:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 9 Nov 2011 23:21:39 +0000 (23:21 +0000)
commitf795a58c90560515cf186d1a6b201a110c125605
treef1479a9eec2a5ca05d7b9bdabe4cff6604d4a85b
parent59f0407aab1d11fb850d202db9caadf4cddc4f58
parent8e540328fc524727c6ced05c2a3450c85f6cbdbe
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