Merge "Merge "Track changes to network security config manifest configuration"... (ce99e3c5) · Commits · e / os / android_frameworks_base

docs/html/preview/features/security-config.jd

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -72,9 +72,8 @@ page.image=images/cards/card-nyc_2x.jpg
	<pre>		<pre>
	<?xml version="1.0" encoding="utf-8"?>		<?xml version="1.0" encoding="utf-8"?>
	<manifest ... >		<manifest ... >
	<application ... >		<application android:networkSecurityConfig="@xml/network_security_config"
	<meta-data android:name="android.security.net.config"		... >
	android:resource="@xml/network_security_config" />
	...		...
	</application>		</application>
	</manifest>		</manifest>