tree 48392e0a14019e584a0dc38c9fa1f2c25c9aab01
parent 60f5ff4f9bda07cf3041732a1a1cedda74ff3077
parent aa6aff0ebbbadd330872967b9abbef476b7cf79e
author Steve Elliott <steell@google.com> 1597782533 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1597782533 +0000

Merge changes I4a979715,I167b23a5

* changes:
  Move NotificationLockscreenUserManager out of NSSL
  Stop injection KeyguardBypassController into NSSL