Commit 0be8a1e4 authored by Maciej Żenczykowski's avatar Maciej Żenczykowski Committed by android-build-merger
Browse files

Merge "net_test: fix sock_diag_test.py to handle ipv5 correctly" am: 2b294be5 

am: 79747d4d

Change-Id: I5fbbfd8dc53fd8e2b95f1a9cd31c5e5ba2ef867d
parents f44908b9 79747d4d
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment