Commit 8afe36da authored Sep 14, 2020 by Remi NGUYEN VAN Committed by Automerger Merge Worker Sep 14, 2020

[automerger skipped] Do not mock shim in TcpSocketTrackerTest am: 9eb5c2c3 am: 166f5ff5 -s ours

am skip reason: Change-Id I580ae9ded468d3f08da336b160596484938bf2a5 with SHA-1 9eb5c2c3 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11490187

Change-Id: If25c2fd2a2bc2048fbda42d9fdc053b98894ac7b

There are no changes