| commit | 1ae8afa555e293c7dc398e7c3fc32765aff1be1e | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Thu Jun 09 01:44:28 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jun 09 01:44:28 2016 +0000 |
| tree | 923a74b01607b1d83f086256b30efa3e9fdca1a3 | |
| parent | b4367730b4a0f26ee779a458ac1aaa816679ae64 [diff] | |
| parent | ff0433c2000afb417908445403db8854748ffbca [diff] |
Merge \\"Always re-enable keyguard state when the user switches.\\" into nyc-dev am: 9e94c455f8 am: ff0433c200 Change-Id: I0c7b0c9f5b5e35404651df0d7cdbc6150bed327a