tree 92723a13d4a62235cf10f7675c759e046fda7d93
parent 73d15db0f03cadbb54bf13400218191fb009a8d4
parent 01edb22617a96502dfb5297eff1cdf5f265299e2
author Jim Miller <jaggies@google.com> 1383956858 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383956858 -0800

am 01edb226: am ed7376fc: Merge "Restore permission check in keyguard." into klp-dev

* commit '01edb22617a96502dfb5297eff1cdf5f265299e2':
  Restore permission check in keyguard.