tree ba936f469da12aeef099e975359d4d66498b1862
parent 986d537c887650504debaa6d8946adf100197760
parent 0860a5c5c303426073c36763bef28644673ff441
author TreeHugger Robot <treehugger-gerrit@google.com> 1583343817 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1583343817 +0000

Merge "RESTRICT AUTOMERGE Update keyguard locked state from TrustManagerService" into pi-dev