tree 472f5aebe723128d4d4bfe1e03da6a442b756cc4
parent 84561026d06fcfbc961c11d12372c83f42fc21c3
parent f54a70cdcd672a6ec8c44aebd61d1170cfc6eb4f
author Chalard Jean <jchalard@google.com> 1596719436 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596719436 +0000

Merge "Resolve the endpoint in legacy VPN" am: f54a70cdcd

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382496

Change-Id: I732bb2282cf5b4ba74653ecc0bd934bf991649de