Merge "[automerger skipped] Resolve the endpoint in legacy VPN am: 002944f78e -s ours am: b07add8ebc -s ours" into rvc-qpr-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
e7ccdf2aca