tree 472f5aebe723128d4d4bfe1e03da6a442b756cc4
parent 0cc2c0d9066b56f2ccc4ddaad788b362cd86dd91
parent c0f31b35d0a4d115a00cfe4536ca03175ec826e8
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: c0f31b35d0

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

Change-Id: I732bb2282cf5b4ba74653ecc0bd934bf991649de