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

am: 1997f76

* commit '1997f76cfc1ca3ee22d629db0504773f4f2abac3':
  Implement action "android.settings.VPN_SETTINGS"
This commit is contained in:
Robin Lee
2016-03-24 18:41:16 +00:00
committed by android-build-merger

View File

@@ -511,6 +511,7 @@
android:icon="@drawable/ic_settings_wireless" android:icon="@drawable/ic_settings_wireless"
android:taskAffinity=""> android:taskAffinity="">
<intent-filter android:priority="1"> <intent-filter android:priority="1">
<action android:name="android.settings.VPN_SETTINGS" />
<action android:name="android.net.vpn.SETTINGS" /> <action android:name="android.net.vpn.SETTINGS" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>