resolve merge conflicts of f36b25c2df to stage-aosp-master am: d4621f6302 (c03cf009) · Commits · e / os / android_packages_apps_Settings

res/layout-land/fingerprint_enroll_find_sensor.xml

+48 −39

Original line number	Diff line number	Diff line
		@@ -40,9 +40,16 @@
		android:clipToPadding="false"
		android:orientation="vertical">

		<LinearLayout
		<ScrollView
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:clipChildren="false"
		android:clipToPadding="false"
		android:fillViewport="true">

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		android:clipChildren="false"
		android:clipToPadding="false">
		@@ -86,6 +93,8 @@

		</LinearLayout>

		</ScrollView>

		</LinearLayout>

		<FrameLayout