Merge "[automerger skipped] Resolve the endpoint in legacy VPN am: 75d9e28a07 -s ours am: dbb502397d -s ours" into rvc-qpr-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
7733abae6b