commit | 1f7d21190400c845339cea87a5d4173aa9db7d22 | [log] [tgz] |
---|---|---|
author | Vikas Marwaha <vikasmarwaha@google.com> | Fri Jun 09 22:14:29 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jun 09 22:14:29 2017 +0000 |
tree | 24ac3573c201b93a276d700082e239d728622ee8 | |
parent | bf26f60dbfd8cf6af8fcfed77be994a983db723d [diff] | |
parent | cccf899295ab16da8a3e812fd5f98dd636f31d40 [diff] |
Merge "CDD: "Clarify what are the conditions to be met in order to be classified as hadware backed and secure hardware"." into nougat-dev am: 5deade678c am: cccf899295 Change-Id: Ibca8a24b5b36b20de662fb94478e65ff04419fab