Skip to content
Commit 4ee521b0 authored by Aaron Huang's avatar Aaron Huang Committed by android-build-merger
Browse files

Merge "Merge "apf: Remove IPv6 NAT-T keepalive related codes and ApfTest... 

Merge "Merge "apf: Remove IPv6 NAT-T keepalive related codes and ApfTest improvement" am: 4d492d89 am: 24f14ed2" into qt-dev-plus-aosp
am: 4168f246

Change-Id: I6d3eb9e6271a0f51dec4a55d68a69b4280175d86
parents 169f5853 4168f246
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