tree 923a74b01607b1d83f086256b30efa3e9fdca1a3
parent b4367730b4a0f26ee779a458ac1aaa816679ae64
parent 6e5ff1cb99131116f9d8ea281a8fccbd59524bab
author Jim Miller <jaggies@google.com> 1465436664 +0000
committer android-build-merger <android-build-merger@google.com> 1465436664 +0000

Merge \\"Always re-enable keyguard state when the user switches.\\" into nyc-dev am: 9e94c455f8
am: 6e5ff1cb99

Change-Id: I188a4a62b72cddffbedb58a527a2b360303b301c