commit 73001713eb8ab2b6365ff6818be99df8379eb66f
author Shawn Willden <swillden@google.com> Tue Nov 24 11:36:04 2020 -0700
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 24 18:36:04 2020 +0000
tree be40120a41369c9f97f2b18aa2ead5d89f4f59eb
parent 34ebe501296b79b58eb2d0c8f8b3db11d8081ddb

Update git submodules

* Update system/keymaster from branch 'master'
  to 6daf9846eec87c2593de6ac48e3a308e367ab8e4
  - Make keymaster's version configurable.
    
    Test: Keystore CTS tests and Keymaster/KeyMint VTS tests on cuttlefish
    Bug: b/173577355
    Change-Id: Ie7dda2c09b9d0b8e5b5b69ba4056ac40af67c870
    

* Update trusty/user/app/keymaster from branch 'master'
  to 693a2796b0877b59b82ec66cb92197b60269374b
  - Update to support keymaster's configurable version.
    
    Test: VtsHalKeymasterV4_TargetTest
    Bug: 173577355
    Change-Id: Ifb100f7a721b57c773f3a4d3f34f22dd47505c9a
    

system/keymaster

diff --git a/system/keymaster b/system/keymaster
index 4b59080..6daf984 160000
--- a/system/keymaster
+++ b/system/keymaster
@@ -1 +1 @@
-Subproject commit 4b590805c63ce860cec6a430d05a7f1840d60ea7
+Subproject commit 6daf9846eec87c2593de6ac48e3a308e367ab8e4

trusty/user/app/keymaster

diff --git a/trusty/user/app/keymaster b/trusty/user/app/keymaster
index 9a4d6f1..693a279 160000
--- a/trusty/user/app/keymaster
+++ b/trusty/user/app/keymaster
@@ -1 +1 @@
-Subproject commit 9a4d6f127c0318f2c6a8945610d89cf15adfb4e5
+Subproject commit 693a2796b0877b59b82ec66cb92197b60269374b