commit | 9202df017a847974ab18e6a5c294d78395602b79 | [log] [tgz] |
---|---|---|
author | Jocelyn Bohr <bohr@google.com> | Wed Jul 19 22:44:19 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Jul 19 22:44:19 2017 +0000 |
tree | 0f6cf93568e7771a35dc5add31cbf6046ee911e6 | |
parent | af54ec9875889e9b3e8a6cf3c703317828aef5da [diff] | |
parent | 4f8fc7b561fd9eb447519f94a0d34793ab125e92 [diff] |
Merge "Set TEE RootOfTrust fields in Attestation Extension" am: fc935cd780 -s ours am: 78f5a4eb2a am: 92ee015fcb am: 4f8fc7b561 -s ours Change-Id: I4e23a36b008ff4931749037d8a81852873c31f66