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