Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix application manifest XML" into mnc-mr-docs

Browse Source 
am: c8dcc2b

* commit 'c8dcc2be4e11f2b4ba250085b92f688572ba0e24':
  Fix application manifest XML

Change-Id: I0007c6bdc5acb04efbfd0f4cab06f34a83fda31b
This commit is contained in:
Chad Brubaker
2016-04-04 16:49:22 +00:00
committed by android-build-merger
parent 83113d6ff3 c8dcc2be4e
commit 3fdc800719
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/html/preview/features/security-config.jd
View File

@@ -71,11 +71,11 @@ page.keywords=preview,security,network
<pre> <pre>
&lt;?xml version="1.0" encoding="utf-8"?&gt; &lt;?xml version="1.0" encoding="utf-8"?&gt;
... ...
&lt;app ...&gt; &lt;application ...&gt;
&lt;meta-data android:name="android.security.net.config" &lt;meta-data android:name="android.security.net.config"
android:resource="@xml/network_security_config" /&gt; android:resource="@xml/network_security_config" /&gt;
... ...
&lt;/app&gt; &lt;/application&gt;
</pre> </pre>
<h2 id="CustomTrust">Customizing Trusted CAs</h2> <h2 id="CustomTrust">Customizing Trusted CAs</h2>