tree ab79a2aae8296cf15a1aa943572e8bb431714e0c
parent 3e5500dc34449df4e1d447abd79715c5006cf70d
parent 926a2a40cf0d2db1ee996d9f83f4dae7d3cb9dae
author Chalard Jean <jchalard@google.com> 1596783294 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596783294 +0000

[automerger skipped] Resolve the endpoint in legacy VPN am: 002944f78e am: 926a2a40cf -s ours

am skip reason: Change-Id I96691f6091c43377f23a00621242ed034fcb0444 with SHA-1 9da9925389 is in history

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

Change-Id: I9ecb2fdf57554028c60084f6ed86f2e4d08fc387