commit | 5cbd4f757c67ebf29c253ed9f11dc09500d4f086 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Dec 15 19:12:22 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 15 19:12:22 2021 +0000 |
tree | d2957ec2a363882ff2bbbcf2352331dd6131abc3 | |
parent | 891c20d0261d38b863c24f57b4d1d2546e81f66b [diff] | |
parent | 8b988e72181f609cc7f47abb3c90bdbbac07e069 [diff] |
Merge "Don't reset the keyguard if it's going away." into sc-v2-dev am: 8b988e7218 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16469210 Change-Id: I1e1ab0db3d151b655f79c075834dcebc5890773a