tree 6c6545b946317951fd7c0942ea9b89e3d3d315d3
parent 3712017d69f09659cbd5f8133449fc7f25f01cfe
parent 873b9b75f8220fd5c34c410089a63a79f38b9530
author Vishwath Mohan <vishwath@google.com> 1533160029 -0700
committer android-build-merger <android-build-merger@google.com> 1533160029 -0700

Merge "CDD: Update CDD language for biometrics and lockscreen." into pi-dev
am: 873b9b75f8

Change-Id: I61e404ea58062cc46db6c48f1b065e371b26eb44