tree 45f5d4da6611cd6974c9fde990a77a86a5d92368
parent 4cccc47ce519ba30c14a5b28895f282f864f2900
parent 7aa535a8633ec93426381c68dc061cd951ab5832
author Jim Miller <jaggies@google.com> 1383957071 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383957071 -0800

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

* commit '7aa535a8633ec93426381c68dc061cd951ab5832':
  Restore permission check in keyguard.