commit | b0cd4d0fb68dbf28427f8f3d5d9c81edacfc177a | [log] [tgz] |
---|---|---|
author | Pat Erley <perley@chromium.org> | Tue Jun 05 07:59:03 2018 |
committer | Pat Erley <perley@chromium.org> | Tue Jun 05 08:02:13 2018 |
tree | c816d376cb0310adccf0008cdc5d1f5da7eebdc5 | |
parent | c75f1afb48b1cd79876ff17434a5d5a4fd16c4a9 [diff] |
trunks: Fixup mis-merges cl/1081157 was not merged correctly, leading to a build failure in tpm_utility_v2.cc. cl/1081159 was not merged correctly, leading to tests failing BUG=b:78571232 TEST=FEATURES=test emerge-fizz attestation Change-Id: I79495f4403bfcb645c52c8df23dc3ae326362490