tree 367608cab9ecb960a1a0f55d0f44bd79a4d7935a
parent 07b15253a1f923bb57d1de86caa09f629c738b0b
parent 8ab21287661ded1ae8334ed619bc765ffdd6cc8b
author Vikas Marwaha <vikasmarwaha@google.com> 1492711822 +0000
committer android-build-merger <android-build-merger@google.com> 1492711822 +0000

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

Change-Id: I593c0d90730a45900a06c70d117092401a48e319