tree 0f631757b6cf25f8d4e58a8a5ba149beb1acc5ca
parent 85aac1d9d8ee6da89a4ca95ff104ed3b644b9a64
parent 4a03ca6ad1adec1a75a43de1b2f3779746c33d77
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1576190224 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1576190224 +0000

Merge "Check screenlock for unlock dialog" into qt-qpr1-dev am: 4a03ca6ad1

Change-Id: I8ab8f5e12e4ec1a14e5f464931a0496ee3483f93