commit | 9b059958bbe8378f00a2018bddf04f382ffd8bd7 | [log] [tgz] |
---|---|---|
author | Eric Biggers <ebiggers@google.com> | Thu Dec 07 19:39:07 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 07 19:39:07 2023 +0000 |
tree | ebc4366babb7d597694a8c368c66a05e73cd29f9 | |
parent | ffbe75880f57f8bb5b6778409614305f235639a8 [diff] | |
parent | 0ba5125d58eac0608fac767435586f1d6945e523 [diff] |
Merge "Split Keystore's onLockScreenEvent into onDevice{Unlocked,Locked}" into main am: 20821529ca am: 19d5180bf8 am: 0ba5125d58 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2855338 Change-Id: I11ba0093f2b9f60c34f08b25966cbcb785127f5b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>