Merge "Move NattKeepalivePacketData out of the framework" am: d3ee38785b am: 382b3d2a63

am: 82184fd8ce

Change-Id: Ie1d02bb7bccb76415cf71824147466cabf6b88b6
This commit is contained in:
Aaron Huang
2019-04-23 22:48:59 -07:00
committed by android-build-merger