tree 7381b4c1f1d4463c2efabfb22f4600b0f21ef34a
parent 6eab1616f176a339fc0c0387f2dcd4ee51207408
parent 3610398310daee02ab39ecd6820b4f390bd03dad
author Vikas Marwaha <vikasmarwaha@google.com> 1497046951 +0000
committer android-build-merger <android-build-merger@google.com> 1497046951 +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
am: 3610398310

Change-Id: Ic18d751736e1b833b714519101d2a8bc4a33a0b7