| commit | a3ea288b3c431a3eeaa5669910d05f3701ae93e6 | [log] [tgz] |
|---|---|---|
| author | Rubin Xu <rubinxu@google.com> | Wed Jun 27 11:40:01 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 27 11:40:01 2018 -0700 |
| tree | ba5f78415b45ca957f9596f6000160a612afc4ad | |
| parent | af957086452e97c9a3d96ef52d6c28134323f98b [diff] | |
| parent | f751657ad8a1e2c9fcee0c0211895a8893cd52b4 [diff] |
[automerger skipped] Merge "Support seamless handover between VPN fds." am: 9916d4b3e8 -s ours am: f751657ad8 -s ours Change-Id: If474cfa932f6bff8065633a263987f3e28d64890