Commit 62ac8089 authored May 26, 2016 by Chad Brubaker Committed by android-build-merger May 26, 2016

Merge "Merge "Track changes to network security config manifest configuration"...

Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am: c0f99aeb" into mnc-io-docs am: ce99e3c5 am: 11b56641
am: 86bceb87

* commit '86bceb87':
  Track changes to network security config manifest configuration

Change-Id: Id4b8b2a06cd2cbebcd47964e05157199c9cf9b31

parents 67f2e2cc 86bceb87

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

+2 −3

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