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)
commit5943c1dc406574b360e9cb1343a5dab00a84a8e2
tree3268e5f0312f4b184fe73073cce08af4e9b310f9
parentbf3f6f42775910544b9292ac1eb8bcdf1d1696d3
parent270826a8878b5470d48d93ca3d518ac93860870d
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