| commit | d7e5011d6615402794b911b882434fea056141e9 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue May 11 20:26:16 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 11 20:26:16 2021 +0000 |
| tree | f4fe6cb9ae4fd73d3be248e428af77fb211717d9 | |
| parent | e71b22e1d17518279bddc6f84aeb93dfcb0a0354 [diff] | |
| parent | b196523b69b6445c5f093bf5fcb9d5f7c627ffc6 [diff] |
Merge "Keystore 2.0: Reinstate the default busy handler." am: 2bd70bf11f am: ec7353f01d am: b196523b69 Original change: https://android-review.googlesource.com/c/platform/system/security/+/1702826 Change-Id: Ibb8a15c2fa39a09f35c5e90c9bf7d8d760847893