tree 9b3ee370b9cf2d2bf6dae001cbc0bbc484aa0949
parent 355284b9d43efa0c8ed15173e8d2a0d5e999437b
parent 92ee015fcb60605d47627e10f846af07b8ccc05c
author Jocelyn Bohr <bohr@google.com> 1500504079 +0000
committer android-build-merger <android-build-merger@google.com> 1500504079 +0000

Merge "Set TEE RootOfTrust fields in Attestation Extension" am: fc935cd780  -s ours am: 78f5a4eb2a
am: 92ee015fcb

Change-Id: I367bf542b8535e492aa57d0d9153411ed976b987