tree dbca75c683d4e8910e4d14d80411f8fb445ac5f5
parent 105b9b05041ea6f1109d961d548f3dde2bd69501
parent 505329b21b743c6e74e0d1b14bea78a22f7b4145
author Jim Miller <jaggies@google.com> 1383956527 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1383956528 +0000

Merge "Restore permission check in keyguard." into klp-dev