Commit 79747d4d 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

Change-Id: I940b83ee0657f84e946a9b61a5d38e7f62861e09
parents 1ebbc44b 2b294be5
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