OSDN Git Service

Merge "Move NattKeepalivePacketData out of the framework" am: 833edcbb1b
authorAaron Huang <huangaaron@google.com>
Wed, 24 Apr 2019 04:26:03 +0000 (21:26 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 24 Apr 2019 04:26:03 +0000 (21:26 -0700)
commit280a223c28b61821656f5a82d3c62703faf5bb73
tree410774776d3255e89309c839e04739a46a93dbc7
parent995bf1e3e662abb49671ec608231b71c933172ee
parentcab3f447ae890c50987e990fd4525ac6830b9040
Merge "Move NattKeepalivePacketData out of the framework" am: 833edcbb1b
am: cab3f447ae

Change-Id: Idf7c25b6b553d8c0cc4ef2ea8193438480420fb4
services/net/java/android/net/NattKeepalivePacketData.java