Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

platform_frameworks_base-old
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

3e07b3a7

Commit 3e07b3a7 authored 5 years ago by Automerger Merge Worker

Downloads
- Plain Diff

Merge changes I5a01d709,I1b7da86d am: 95d9c616

Change-Id: I7079ddf41c18c3c073e3a0234fbd15f40a339315

parents 82f3668d 95d9c616

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

core/java/com/android/internal/net/VpnConfig.java 1 addition, 0 deletions

core/java/com/android/internal/net/VpnConfig.java
services/core/java/com/android/server/connectivity/Vpn.java 92 additions, 23 deletions

services/core/java/com/android/server/connectivity/Vpn.java
services/core/java/com/android/server/net/LockdownVpnTracker.java 2 additions, 2 deletions

.../core/java/com/android/server/net/LockdownVpnTracker.java

with 95 additions and 25 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment