OSDN Git Service

Merge "Fix ConnectivityServiceTest for NATT Keepalive"
authornharold <nharold@google.com>
Tue, 20 Feb 2018 19:17:23 +0000 (19:17 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 20 Feb 2018 19:17:23 +0000 (19:17 +0000)
commit6d5aea8811af3e87c3c3fead609cbb8d50c38df7
tree771b4f3ef15a20f97b427489da5a4b93ee2b4ff3
parent0ea144f4bf510a5f41e40b80b23a5a6e531750a0
parent63dd81390dcae5b59c6a490b803e67721804b80a
Merge "Fix ConnectivityServiceTest for NATT Keepalive"
core/java/android/net/ConnectivityManager.java
tests/net/java/com/android/server/ConnectivityServiceTest.java