tree 6faa2f32b2d707d5310569d4795905c96cd52cd1
parent 07a3f0fe8d447b84a8082c4c63bd162fb1f6728c
parent 7522764e594e54ca6a8eb9ad6edde9f38139ec47
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579015123 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579015123 +0000

Merge "Make NattKeepalivePacketData @SystemApi" am: 3516f5853a am: 7522764e59

Change-Id: If93d5bacd85fa5209f3fbb55d1cf0af1231e605d