OSDN Git Service

Merge "Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen...
authorJim Miller <jaggies@google.com>
Wed, 9 Nov 2011 23:19:31 +0000 (15:19 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 9 Nov 2011 23:19:31 +0000 (15:19 -0800)

Trivial merge