Merge "Adding slice for Face Enrollment" into qt-r1-dev am: 35252d1b9f

author Joshua Mccloskey <joshmccloskey@google.com>

Wed, 26 Jun 2019 02:31:34 +0000 (19:31 -0700)

committer android-build-merger <android-build-merger@google.com>

Wed, 26 Jun 2019 02:31:34 +0000 (19:31 -0700)
author Joshua Mccloskey <joshmccloskey@google.com>
Wed, 26 Jun 2019 02:31:34 +0000 (19:31 -0700)
committer android-build-merger <android-build-merger@google.com>
Wed, 26 Jun 2019 02:31:34 +0000 (19:31 -0700)
diff --cc res/values/strings.xml
Simple merge
diff --cc src/com/android/settings/slices/CustomSliceRegistry.java
Simple merge
author	Joshua Mccloskey <joshmccloskey@google.com>
	Wed, 26 Jun 2019 02:31:34 +0000 (19:31 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 26 Jun 2019 02:31:34 +0000 (19:31 -0700)
		1	2
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/slices/CustomSliceRegistry.java	patch \|	diff1 \|	diff2 \|	blob \| history