tree 96e0cee79f83505c421386d4d5458b5494805013
parent 24c74234520a66e218854ffdf6cb3e64cf90b30c
parent a50c41b050cea7cb2cacc9bdc7411dca24052dea
author Chiachang Wang <chiachangwang@google.com> 1662124242 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1662124242 +0000

Merge "Correctly handle null ProxyInfo in Ikev2VpnProfile" am: a03fa63d19 am: a50c41b050

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

Change-Id: I600dc5f51430b2702cbb13af066e458e190561fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>