OSDN Git Service

Merge "Fix ConnectivityServiceTest for NATT Keepalive"
authornharold <nharold@google.com>
Tue, 20 Feb 2018 22:55:38 +0000 (22:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Feb 2018 22:55:38 +0000 (22:55 +0000)
commitad96984eb5be6f986e5d3d492a507e4885094e3d
tree22bcb3e659c76b0d5dec27677fa74a59a9bb4581
parent8deca3f06f1f7fb7636c6a088710162990985728
parent6d5aea8811af3e87c3c3fead609cbb8d50c38df7
Merge "Fix ConnectivityServiceTest for NATT Keepalive"
am: 6d5aea8811

Change-Id: Idbdffc7bbd2d9a96f6e6052810722df04a20a65c