commit 1ed701493a6363c58b86de8dac600fca990a131a
author Dirk Dougherty <ddougherty@google.com> Thu May 26 05:03:24 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 26 05:03:25 2016 +0000
tree 5e6af62d1384c6e01779945b16b251bb94acb67e
parent c0f99aebdc7c803600e12cbe0d940219069eb066
parent 3930b5091e382863f82df84c2fae2207838291d7

Merge "Remove spurious url reference." into mnc-mr-docs

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

diff --git a/docs/html/preview/features/security-config.jd b/docs/html/preview/features/security-config.jd
index f8c0325..2706ced 100644
--- a/docs/html/preview/features/security-config.jd
+++ b/docs/html/preview/features/security-config.jd
@@ -72,9 +72,8 @@
 <pre>
 &lt;?xml version="1.0" encoding="utf-8"?&gt;
 &lt;manifest ... &gt;
-  &lt;application ... &gt;
-    &lt;meta-data android:name="android.security.net.config"
-               android:resource="@xml/network_security_config" /&gt;
+  &lt;application android:networkSecurityConfig="@xml/network_security_config"
+               ... &gt;
     ...
   &lt;/application&gt;
 &lt;/manifest&gt;