Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a82de8eb authored by Aaron Huang's avatar Aaron Huang Committed by android-build-merger
Browse files

[automerger skipped] Merge "apf: Remove IPv6 NAT-T keepalive related codes and... 

[automerger skipped] Merge "apf: Remove IPv6 NAT-T keepalive related codes and ApfTest improvement" into qt-dev
am: 2913482e08 -s ours
am skip reason: change_id If01bc6a71cf26e13edc049d969d23088fa8242e4 with SHA1 ec92b94320 is in history

Change-Id: I155dc9f533a467f8ed1fd2a162b09969d80392dc
parents 496ee116 faa5f905
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment