resolved conflicts for merge of e8962d4b to klp-dev-plus-aosp (c5b6267d) · Commits · e / os / android_frameworks_base

core/res/res/values/symbols.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -939,7 +939,6 @@
		<java-symbol type="string" name="restr_pin_try_later" />
		<java-symbol type="string" name="write_fail_reason_cancelled" />
		<java-symbol type="string" name="write_fail_reason_cannot_write" />
		<java-symbol type="string" name="transient_navigation_confirmation" />
		<java-symbol type="string" name="ssl_ca_cert_noti_by_unknown" />
		<java-symbol type="string" name="ssl_ca_cert_noti_managed" />
		<java-symbol type="string" name="ssl_ca_cert_warning" />