OSDN Git Service

Merge "Add StackedLinkProperties test case"
authorChalard Jean <jchalard@google.com>
Thu, 21 Jun 2018 04:23:17 +0000 (21:23 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Jun 2018 04:23:17 +0000 (21:23 -0700)
commit946957bc324c1edc9b5a85f260d3eaa70b4fe8fb
tree5abbfa09f4aafb8c401321a4aba56d7f4233787e
parent26f781db62e49e311009fc7a39155f72ab174d94
parentfaf31f86381122507398624698b7c89273f01ff5
Merge "Add StackedLinkProperties test case"
am: faf31f8638

Change-Id: I33d75bf593708317dca4ba6cec035b7f035cfa86
services/core/java/com/android/server/ConnectivityService.java
tests/net/java/com/android/server/ConnectivityServiceTest.java