tree 2e0816e1351d62cb16fd29c1c3956da99baf954b
parent 1b21665bf6a1049809185e878e0e29ed3f29d197
parent c8867b2807b6d7ffcd3c2f935d1fe8c857a9ef8d
author Jim Miller <jaggies@google.com> 1384393818 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384393818 -0800

am c8867b28: Merge "Report keyguard as initially showing and secure until we know" into klp-dev

* commit 'c8867b2807b6d7ffcd3c2f935d1fe8c857a9ef8d':
  Report keyguard as initially showing and secure until we know