tree 367608cab9ecb960a1a0f55d0f44bd79a4d7935a
parent b8233e617988f9eb5d95809d27ea4d76e5197c42
parent 06f0abad22b6264495a401c2728426e909052638
author Vikas Marwaha <vikasmarwaha@google.com> 1492711640 +0000
committer android-build-merger <android-build-merger@google.com> 1492711640 +0000

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

Change-Id: Ia933ac4b8fb0d36c9e4b97ff69a0b35375439d09