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