tree 5ddec1f00f0fd0c7bc4835d6d645b72041fc79c9
parent cc1039b7c73756ad9fa0aa863df697478c4d8282
parent 964daa1a04f42e523f7901fef8ccd515dee33297
author Lorenzo Colitti <lorenzo@google.com> 1607374825 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607374825 +0000

Merge "Add a test for TcpKeepalivePacketDataParcelable.toString()." am: ee3c193706 am: 4f4ac4840d am: 964daa1a04

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1502382

Change-Id: Ib3cf8cfb3f658e119d6c725653fcfaa385766b1f