OSDN Git Service

Merge "Add NATT keepalive resources and methods into IpSecService"
authorBenedict Wong <benedictwong@google.com>
Mon, 22 Apr 2019 20:31:52 +0000 (13:31 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 22 Apr 2019 20:31:52 +0000 (13:31 -0700)
commitf8893a980f1395670a674f44abd3d11ba9d2be0a
tree857d4386c42b3ae859a00b1ebf563afbaaecf2dd
parent16144f90f6b270fe2455e17e4b0c0230c055f434
parentc345527430454576451fd52d3c896610f4283c1f
Merge "Add NATT keepalive resources and methods into IpSecService"
am: c345527430

Change-Id: I97e7451959d619f42d68a5c29cca410bf0740852