commit | d11ca7599bf606dc1d970a7806c9880dda5d9698 | [log] [tgz] |
---|---|---|
author | Rubin Xu <rubinxu@google.com> | Wed Jun 27 12:01:21 2018 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Wed Jun 27 12:01:21 2018 -0700 |
tree | 35640224236f07e7453720e05a7c99106e002fa4 | |
parent | 73c35f846f66067c15a99854f3a8f3b6d6d98bf7 [diff] | |
parent | a3ea288b3c431a3eeaa5669910d05f3701ae93e6 [diff] |
[automerger skipped] Merge "Support seamless handover between VPN fds." am: 9916d4b3e8 -s ours am: f751657ad8 -s ours am: a3ea288b3c -s ours Change-Id: If19c98d0becb9b1e788f6a7196f14211a52d2610