Skip to content
Commit fc24e077 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:... 

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

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



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