OSDN Git Service

Merge changes from topic "biometric-cc"
authorKevin Chyn <kchyn@google.com>
Fri, 2 Nov 2018 00:37:24 +0000 (00:37 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 2 Nov 2018 00:37:24 +0000 (00:37 +0000)
commit0e11b18cf0e8f43cc87807c593a1e90232d05eac
tree328b5f0893113a3fc5523e5584d81081254fdfff
parent887564b11485522bd1863ddf18b8f11553f661b0
parentb3ee23154d866d3f7420081e32031f82e8bb0722
Merge changes from topic "biometric-cc"

* changes:
  3/n: Make CDCA transparent and add BiometricPrompt
  2/n: Add comments to launchConfirmationActivity parameters
  1/n: Prepare ConfirmDeviceCredentials to use BiometricPrompt
AndroidManifest.xml
res/values/strings.xml