Skip to content
Commit fea2f221 authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Correctly handle null ProxyInfo in Ikev2VpnProfile" am: a03fa63d am: a50c41b0 

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



Change-Id: I600dc5f51430b2702cbb13af066e458e190561fe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 24c74234 a50c41b0
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