OSDN Git Service

Merge "Implement action "android.settings.VPN_SETTINGS"" into nyc-dev
authorRobin Lee <rgl@google.com>
Thu, 24 Mar 2016 18:41:16 +0000 (18:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 Mar 2016 18:41:16 +0000 (18:41 +0000)
commit32c3be8e0392fd2f26ed505f52f048691628addd
tree7b516f7ee5ec442fb6faa441ff8d16be8e3cb0f2
parent736afac6cbfdc2f96fc074afbc6f25f5243fba42
parent1997f76cfc1ca3ee22d629db0504773f4f2abac3
Merge "Implement action "android.settings.VPN_SETTINGS"" into nyc-dev
am: 1997f76

* commit '1997f76cfc1ca3ee22d629db0504773f4f2abac3':
  Implement action "android.settings.VPN_SETTINGS"
AndroidManifest.xml