OSDN Git Service

[automerger skipped] Merge "Support seamless handover between VPN fds."
authorRubin Xu <rubinxu@google.com>
Wed, 27 Jun 2018 18:27:29 +0000 (11:27 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 27 Jun 2018 18:27:29 +0000 (11:27 -0700)
commitf751657ad8a1e2c9fcee0c0211895a8893cd52b4
treebf9b2be5c26e9e0ac843dbbd42ccf1de056ed50e
parent16de9c5a8a818b97969af16c08baeb860a786a6d
parent9916d4b3e89b1faf8b658cc3924e0b30cc46958a
[automerger skipped] Merge "Support seamless handover between VPN fds."
am: 9916d4b3e8  -s ours

Change-Id: Ieac6b403e5c242f161da56a917e55b07badc888d