OSDN Git Service

Merge "Fix ConnectivityServiceTest for NATT Keepalive" am: 6d5aea8811
authornharold <nharold@google.com>
Tue, 20 Feb 2018 23:07:53 +0000 (23:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Feb 2018 23:07:53 +0000 (23:07 +0000)
commit0a177afbb88a6f3cbc401edbb6cd47282ff9e671
treebe5452436195bc99880294c5dafb3b691924bd96
parent50450452cfc4240ac3728d4dbdd756f6403b6995
parentad96984eb5be6f986e5d3d492a507e4885094e3d
Merge "Fix ConnectivityServiceTest for NATT Keepalive" am: 6d5aea8811
am: ad96984eb5

Change-Id: I3c28cbb55f8226776792df9cacf1b5e527389157