| commit | 01edb22617a96502dfb5297eff1cdf5f265299e2 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Fri Nov 08 16:25:06 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 08 16:25:06 2013 -0800 |
| tree | 2b58731570bbcb803c73f645d7c545064b0a8535 | |
| parent | 575d07ed54514958caf80d64e0503c55abdf2577 [diff] | |
| parent | ed7376fc4829e93f5f2d3037633a37d652a13a7c [diff] |
am ed7376fc: Merge "Restore permission check in keyguard." into klp-dev * commit 'ed7376fc4829e93f5f2d3037633a37d652a13a7c': Restore permission check in keyguard.