[automerger skipped] Merge "apf: Remove IPv6 NAT-T keepalive related codes and ApfTest improvement" into qt-dev

Browse Source

am: 2913482e08 -s ours
am skip reason: change_id If01bc6a71cf26e13edc049d969d23088fa8242e4 with SHA1 ec92b94320 is in history

Change-Id: I155dc9f533a467f8ed1fd2a162b09969d80392dc

...

This commit is contained in:

Aaron Huang

2019-05-15 17:45:56 -07:00

committed by android-build-merger

parent 1880333817 2913482e08

commit 92ba6d1ebe

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