Skip to content
Commit 99114769 authored by Benedict Wong's avatar Benedict Wong Committed by Automerger Merge Worker
Browse files

Merge "Add API for VCN configuration of UDP port 4500 NAT Timeouts" am: c1bd0480 am: 48e1a31d 

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



Change-Id: Ic90fef6bbefc71f752f7e9bc0227eb7656476163
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 09aa429d 48e1a31d
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