Skip to content
Commit a83c36d7 authored by Xiao Ma's avatar Xiao Ma Committed by android-build-merger
Browse files

Merge "Replace TcpSocketInfo with TcpKeepalivePacketDataParcelable in... 

Merge "Replace TcpSocketInfo with TcpKeepalivePacketDataParcelable in ApfTest." am: e7e5a35b am: a88f9010
am: fb6ce004

Change-Id: I488efad5dffa7a4b74ed0fd6525c918311651252
parents d240a8ca fb6ce004
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment