tree 0d5d50aef2b4b7ab45269194f44ea5545d3da8b1
parent a9fa82628c83154ae3a8b3c2ef6540adf980aec6
parent 457ee6c0157bcb1c18163a0ed35bfe318774beea
author TreeHugger Robot <treehugger-gerrit@google.com> 1597901682 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1597901682 +0000

Merge "Updating allowed keymaster attestation versions" into stage-aosp-rvc-ts-dev