tree c304cd3740ad94efdfc9a70aeb633c46768d9a0f
parent 26283a2419fa2161e88feee76892b537c388bf67
parent 6bfd0a508fcd077ba1331f6224882a6c6f6237ab
author Rubin Xu <rubinxu@google.com> 1558988370 -0700
committer android-build-merger <android-build-merger@google.com> 1558988370 -0700

Merge "Merge "Fix deadlock in KeyguardDisableHandler" into qt-dev am: 6cf5ea63eb am: 42c4a92560" into qt-r1-dev-plus-aosp
am: 6bfd0a508f

Change-Id: I8ecc0a456ce245d6d5e803a74cb3f7f29cc236b7