OSDN Git Service

Merge "Move NattKeepalivePacketData out of the framework" am: 833edcbb1b am: cab3f447ae
authorAaron Huang <huangaaron@google.com>
Wed, 24 Apr 2019 05:48:59 +0000 (22:48 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 24 Apr 2019 05:48:59 +0000 (22:48 -0700)
am: 280a223c28

Change-Id: Ie1d02bb7bccb76415cf71824147466cabf6b88b6


Trivial merge