From: Jim Miller <jaggies@google.com>
Date: Thu, 26 Jan 2012 22:34:08 +0000 (-0800)
Subject: am fb9e3643: Merge "Fix 5620754: don\'t show pattern unlock after SIM unlock if not... 
X-Git-Tag: android-x86-4.4-r1~1961
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=49dc3ef8731c2fe6a21d0acb9554d67aa08b267e;p=android-x86%2Fframeworks-native.git

am fb9e3643: Merge "Fix 5620754: don\'t show pattern unlock after SIM unlock if not enabled."

* commit 'fb9e364380f91295490d1acbfc9a571cb6a4384b':
  Fix 5620754: don't show pattern unlock after SIM unlock if not enabled.
---

49dc3ef8731c2fe6a21d0acb9554d67aa08b267e