merge in nyc-release history after reset to master
diff --git a/tpm_types.h b/tpm_types.h
index 56af630..eec5e48 100644
--- a/tpm_types.h
+++ b/tpm_types.h
@@ -1265,13 +1265,10 @@
} TPM2B_ECC_PARAMETER;
// Table 162 Definition of TPMS_ECC_POINT Structure
-// TODO(ngm): To be fixed in the generator, crbug.com/49770.
typedef struct {
- UINT16 unused_pad1;
TPM2B_ECC_PARAMETER x;
- UINT16 unused_pad2;
TPM2B_ECC_PARAMETER y;
-} TPMS_ECC_POINT __attribute__ ((aligned (4)));
+} TPMS_ECC_POINT;
// Table 163 Definition of TPM2B_ECC_POINT Structure
typedef union {
