| commit | 1691d74d220e65b4b0923d063c6c70b15ca5ac7d | [log] [tgz] |
|---|---|---|
| author | Jocelyn Bohr <bohr@google.com> | Wed Nov 01 18:45:45 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 01 18:45:45 2017 +0000 |
| tree | 59348c7083fffc89a6598537cc43897f5f992218 | |
| parent | df9cb9785b6ab970b70b1080abbde81adb0b6f52 [diff] | |
| parent | 2f84aa00421d22a4cd8e4593cf7d7dbf47a86373 [diff] |
Merge "DO NOT MERGE: Set TEE RootOfTrust fields in Attestation Extension" into stage-aosp-master am: 12ec6e3aee am: 2f84aa0042 -s ours Change-Id: Ic6145c718d010a978608fb6f523a5e04ab5c25a2