OSDN Git Service

Merge "Move NattKeepalivePacketData out of the framework"
authorAaron Huang <huangaaron@google.com>
Wed, 24 Apr 2019 04:17:26 +0000 (21:17 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 24 Apr 2019 04:17:26 +0000 (21:17 -0700)
commitcab3f447ae890c50987e990fd4525ac6830b9040
tree7ea7cc38ff76126fc43df119f019a4064c09346d
parentd60707b4eaf79825832fd889e88d498ae38b6048
parent833edcbb1b7247ad3ed711a0cf72cc29e8ab0e02
Merge "Move NattKeepalivePacketData out of the framework"
am: 833edcbb1b

Change-Id: I3c291d378ed3dc54199708fdc188a908ccb3ee08