OSDN Git Service

Merge "Fix 5620754: don't show pattern unlock after SIM unlock if not enabled."
authorJim Miller <jaggies@google.com>
Thu, 26 Jan 2012 22:30:49 +0000 (14:30 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 26 Jan 2012 22:30:49 +0000 (14:30 -0800)

Trivial merge