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

Merge "Add KEY_MIN_UDP_PORT_4500_NAT_TIMEOUT_SEC_INT in CarrierConfigManager"... 

Merge "Add KEY_MIN_UDP_PORT_4500_NAT_TIMEOUT_SEC_INT in CarrierConfigManager" am: e22b680c am: 32dfee3c

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



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