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

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

[automerger skipped] Merge "Dropping NAT-T keepalive packet from APF" into qt-dev 

am: 7afeb17fb2 -s ours
am skip reason: change_id Ib3416ec37f0de12daf882068e00673ad60438c1a with SHA1 2493db8396 is in history

Change-Id: I16743a86151aca1d4630fea8dc576230d0cb9aaa
parents ed59c861 adbea53d
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