OSDN Git Service

Merge "Support seamless handover between VPN fds." into pi-dev
authorLorenzo Colitti <lorenzo@google.com>
Wed, 6 Jun 2018 14:05:13 +0000 (07:05 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 6 Jun 2018 14:05:13 +0000 (07:05 -0700)
commiteacc81f7bb23dfd5286ba7a30711f74704033c87
treed0ab1264462106ad6847bc8c9b6d306e786408f0
parentbbaf6a4a6f40d9dc8cc5f5a0fad69ec138da1368
parentf35fd8653c366158780d925c9dc1e0bee913307e
Merge "Support seamless handover between VPN fds." into pi-dev
am: f35fd8653c

Change-Id: Ia94a34a1f4763d12b6d5ca702640933bc5c84499
services/core/java/com/android/server/connectivity/Vpn.java