| commit | 6593c28c3110daa8cc2f2816ce9640a6848088db | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Tue Mar 15 01:26:16 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Mar 15 01:26:17 2016 +0000 |
| tree | e246748cee6907f2b4f4cfcff851f31201e37f73 | |
| parent | b6692a3ae6f1ab273ec57f5f2e5cc8be37d07219 [diff] | |
| parent | a622d3cc551d8f957c07836265947bfe4d36ee5e [diff] |
Merge "Attempt to fix problem where keyguard isn't locking" into nyc-dev