tree 24ac3573c201b93a276d700082e239d728622ee8
parent 7bfab4f13cb193d9953001ae7421af86f37f23c2
parent 391d200a1cb03c7460d425e59aff7401370691b3
author Vikas Marwaha <vikasmarwaha@google.com> 1497046857 +0000
committer android-build-merger <android-build-merger@google.com> 1497046857 +0000

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 am: 1f7d211904
am: 391d200a1c

Change-Id: I12aa2826cd6789eb95b443e63aa81f3341ebc4a4