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

Commit c3ba7fa0 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: d8edfbbd79 -s ours
am: f1cf4f0ee6 -s ours
am skip reason: change_id I6d3eb9e6271a0f51dec4a55d68a69b4280175d86 with SHA1 4a40e911d0 is in history

Change-Id: I3ee026265b0aee500e69922c9fabf6d3390cf18d
parents f46866cb 32573e2c
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