tree b226fda8f8e5651e6187686162504940e95677c0
parent d0bc2bb949ddc2dbee6d00056a153f41b5441ea0
parent 33a0fe9daaa52717dd0bd681645b2081bf03ac00
author Rubin Xu <rubinxu@google.com> 1522148256 +0000
committer android-build-merger <android-build-merger@google.com> 1522148256 +0000

Merge "Require strong auth after user is stopped" into pi-dev am: 7109908a4e
am: 33a0fe9daa

Change-Id: I3f819788b02f80caf55df46bdaf19bcf00f34121