tree b23bec00aa68330cd3623848e146aac007d49294
parent 664020369d9c3c00b83bc61f3dfd8ec51619a11d
parent 5c9768b521cb1f813223822cc4d14f5ae576d8e6
author Jeff Brown <jeffbrown@google.com> 1339695230 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339695230 -0700

am 5c9768b5: am b44700f2: Merge "When SIM absent, keyguard should be considered non-secure." into jb-dev

* commit '5c9768b521cb1f813223822cc4d14f5ae576d8e6':
  When SIM absent, keyguard should be considered non-secure.