Skip to content
Commit 5d63ac94 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by android-build-merger
Browse files

[automerger skipped] Move TcpKeepalivePacketData out of the framework. am:... 

[automerger skipped] Move TcpKeepalivePacketData out of the framework. am: a3f811a5 am: bc1d9ded
am: aa597216 -s ours
am skip reason: change_id Ib2805f7fcc516a5f6989c252365d1c95b8042703 with SHA1 27e59c57 is in history

Change-Id: I844cf9813437afda3c835b087607a5ef2b38dc42
parents 7bedaa13 aa597216
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