commit | ee44db6f51e68dfeea19c0c82b6475c9d4dd07ec | [log] [tgz] |
---|---|---|
author | Eric Biggers <ebiggers@google.com> | Thu Dec 07 19:03:15 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 07 19:03:15 2023 +0000 |
tree | 2110cdab4a9d21913200920222558a13a35f891e | |
parent | 8846ba0a63058bb7bd5e11c01193c56eccb96355 [diff] | |
parent | 85c8ac51562201698b8fcf273963a0dff7cc972c [diff] |
Merge "Split Keystore's onLockScreenEvent into onDevice{Unlocked,Locked}" into main am: 20821529ca am: 85c8ac5156 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2855338 Change-Id: I03b6f6a89a30f48b7306267581a3573a98e44cff Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>