tree 367608cab9ecb960a1a0f55d0f44bd79a4d7935a
parent 2857591d64b9a1596abaf9f69aa9b00d60b5e1bd
parent 83536f4d736ed9e5498dbea1dd9483f4cddd48d7
author Vikas Marwaha <vikasmarwaha@google.com> 1492711502 +0000
committer android-build-merger <android-build-merger@google.com> 1492711502 +0000

Merge "CDD: Clarified hardware-backed keystore requirement." into nougat-mr1-dev
am: 83536f4d73

Change-Id: I31be9f20b45380a086b4a44d7f56706e85f6083d