| commit | ff0433c2000afb417908445403db8854748ffbca | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Thu Jun 09 01:41:36 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jun 09 01:41:36 2016 +0000 |
| tree | 1337023375f60ee6dcbbd42b1fd6668158d04e8c | |
| parent | 0354b47b28fcfbc36a8a71293234e5946c93955e [diff] | |
| parent | 9e94c455f8e65c81863c93c0e380be4c6bab2752 [diff] |
Merge \"Always re-enable keyguard state when the user switches.\" into nyc-dev am: 9e94c455f8 Change-Id: If2ebbeba6060fde2bb34e81f54bccdaa82430f6e