Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e6f90e4 authored Apr 12, 2016 by Kevin Hufnagle Committed by android-build-merger Apr 12, 2016

Merge "docs: Clarified structure of security config file." into mnc-mr-docs

am: c3cada0a

* commit 'c3cada0a':
  docs: Clarified structure of security config file.

Change-Id: Iae9f64995c9d2fb90ad0e37cff949f03f75cc999

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

+4 −3

Original line number	Diff line number	Diff line
		@@ -70,12 +70,13 @@ page.keywords=preview,security,network

		<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>
		</manifest>
		</pre>

		<h2 id="CustomTrust">Customizing Trusted CAs</h2>