tree 24ac3573c201b93a276d700082e239d728622ee8
parent 715fa71e9896fdeaff103ed83541ef0ffd1a69a3
parent 5deade678c16eda062499baa96a3334658841ce1
author Vikas Marwaha <vikasmarwaha@google.com> 1497045833 +0000
committer android-build-merger <android-build-merger@google.com> 1497045833 +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

Change-Id: I9ba5054974bd9b04ce5061a00cf6977a7dd6527e