commit | 146a86bea95882371d1c0c1c338dbe8e8b6a4bb0 | [log] [tgz] |
---|---|---|
author | Eric Biggers <[email protected]> | Thu Dec 07 19:36:14 2023 +0000 |
committer | Automerger Merge Worker <[email protected]> | Thu Dec 07 19:36:14 2023 +0000 |
tree | 7ff2d8bc887e9e46f05eee7ab4976c526af728f8 | |
parent | 0e782f511650b73c61cfd58fc4674d4e4efcfa1f [diff] | |
parent | ee44db6f51e68dfeea19c0c82b6475c9d4dd07ec [diff] |
Merge "Split Keystore's onLockScreenEvent into onDevice{Unlocked,Locked}" into main am: 20821529ca am: 85c8ac5156 am: ee44db6f51 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2855338 Change-Id: Idd7fed048d11b54d76dba27be2a396d8d09ad88d Signed-off-by: Automerger Merge Worker <[email protected]>