tree 1c35769f9962be11fc332887b58e0f8b504f4d25
parent 5298ddbb009befa71ba3d63853e611a2ecacaa27
parent ddca01a6af3c2eb1f02e757694041ad7e9aa0bc7
author Remi NGUYEN VAN <reminv@google.com> 1623742494 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1623742494 +0000

Merge "Fix KeepalivePacketDataUtilTest crash on eng build" am: efdffa82f8 am: ddca01a6af

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1736261

Change-Id: Id5cc28a2387288bdb975c29da6571d44e939b932