OSDN Git Service

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

Change-Id: I26a69940636e362a3ff5d76ba2eecc012faf39d0


Trivial merge