tree eeb26fd15cb799bd194aaa71ed82141dd3b1e81f
parent 69728afbc787a85c855495983acf3213ab6eaab5
parent e7e5a35b38f8c054218f3457549109fb6d6ba0db
author Xiao Ma <xiaom@google.com> 1550474724 -0800
committer android-build-merger <android-build-merger@google.com> 1550474724 -0800

Merge "Replace TcpSocketInfo with TcpKeepalivePacketDataParcelable in ApfTest."
am: e7e5a35b38

Change-Id: I555a4c49a92148a492172a4f2cec993428140cdc