commit | 5df5479721d7782f4de2baa888706fd544ed565c | [log] [tgz] |
---|---|---|
author | Andrew Scull <ascull@google.com> | Thu Mar 24 22:03:22 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 24 22:03:22 2022 +0000 |
tree | 801e864bf61bac801335631bcef45609ad0199eb | |
parent | d0311c5a459986da2afbeea2d7da412ffa63afd0 [diff] | |
parent | f0e98f51518409780f0336a20f833085d3272a72 [diff] |
Merge "Diced: Don't add resettable config" am: 8058404d27 am: f0e98f5151 Original change: https://android-review.googlesource.com/c/platform/system/security/+/2042543 Change-Id: Id630de3fa07a40c8128bbc505eecfba2f5530ffd Signed-off-by: Automerger Merge Worker