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

Browse Source

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

Change-Id: I4581c0ad5c5945c22835c6298c817e9ccf87975e

...

This commit is contained in:

Aaron Huang

2019-05-15 08:46:44 -07:00

committed by android-build-merger

parent 285a12043d 7afeb17fb2

commit c2af11cf1b

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available