commit 1997f76cfc1ca3ee22d629db0504773f4f2abac3
author Robin Lee <rgl@google.com> Thu Mar 24 18:32:51 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 24 18:32:51 2016 +0000
tree 076b1ff59eafd02b2917b165ef1ab44f4204d66e
parent f3dc18b65bd78d7f00b6255208864cb6899674bc
parent d3041943a7b887c58f0f343bbae4890c0a2ada7f

Merge "Implement action "android.settings.VPN_SETTINGS"" into nyc-dev

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 81893e5..72f567e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -511,6 +511,7 @@
                 android:icon="@drawable/ic_settings_wireless"
                 android:taskAffinity="">
             <intent-filter android:priority="1">
+                <action android:name="android.settings.VPN_SETTINGS" />
                 <action android:name="android.net.vpn.SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>