| commit | c82bcca5510a3d21113e7fbab16bbfe4d124e934 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Fri Jul 26 21:06:18 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jul 26 21:06:18 2013 +0000 |
| tree | 82aac1191a5dbe9ae6200a9367f2fd0aefa26326 | |
| parent | 9f213c8b648c06e781911c12d6c12f6a6606f6d2 [diff] | |
| parent | a92ce1f32d87e2894586ed089a7e6090642993fe [diff] |
Merge "Keyguard doesn't need new MANAGE_DEVICE_ADMINS permission"