| commit | 7aa535a8633ec93426381c68dc061cd951ab5832 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Fri Nov 08 16:27:38 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 08 16:27:38 2013 -0800 |
| tree | 92723a13d4a62235cf10f7675c759e046fda7d93 | |
| parent | 73d15db0f03cadbb54bf13400218191fb009a8d4 [diff] | |
| parent | 01edb22617a96502dfb5297eff1cdf5f265299e2 [diff] |
am 01edb226: am ed7376fc: Merge "Restore permission check in keyguard." into klp-dev * commit '01edb22617a96502dfb5297eff1cdf5f265299e2': Restore permission check in keyguard.