tree 7d72397067ee637b9854e2be234d3c7efff15b3a
parent 4d6445051636ceadfb1fa86395666e28a32cc4ba
parent 4820e9d4e4e8df56a7f8cf3b5039a060b21548d2
author Chalard Jean <jchalard@google.com> 1596731754 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596731754 +0000

Merge "Resolve the endpoint in legacy VPN" am: 429b59c8a4 am: fc546021bb am: 4820e9d4e4

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

Change-Id: I96691f6091c43377f23a00621242ed034fcb0444