commit | 6ec35f44619342de1d0b426f4c4e2b31820820a6 | [log] [tgz] |
---|---|---|
author | Eric Biggers <ebiggers@google.com> | Thu Oct 19 16:22:26 2023 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Oct 19 16:22:26 2023 +0000 |
tree | dda8d31b51197f801a7327b10fd74a8ac5f74ea9 | |
parent | 61e3d4fa11327ecddbdd45a5e0154564e234f899 [diff] | |
parent | b1f641d7a5ec7dded9157650fc2ccb13abc24825 [diff] |
Merge changes I98f7716d,I9b16934f,I78f15e21 into main * changes: keystore2: rename the ScreenLockBound superencryption keys and type keystore2: rename the LskfBound superencryption key and type keystore2: rename values of UserState enum