Skip to content
Commit 8bab75e2 authored by Chalard Jean's avatar Chalard Jean Committed by Automerger Merge Worker
Browse files

[automerger skipped] Resolve the endpoint in legacy VPN am: 002944f7 -s ours... 

[automerger skipped] Resolve the endpoint in legacy VPN am: 002944f7 -s ours am: b07add8e -s ours

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

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

Change-Id: Ie5b037df1d53019c773ecebf7db9d38dd9dd8df0
parents ad43b35e b07add8e
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment