OSDN Git Service

Merge "Logging improvements when NetworkCapabilities change" into oc-dr1-dev
authorHugo Benichi <hugobenichi@google.com>
Fri, 28 Jul 2017 23:54:03 +0000 (23:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 28 Jul 2017 23:54:03 +0000 (23:54 +0000)
commit6992f4edb34c52cdb5176ecef0e97d9d1c82b245
treee4f03dcbf697e8c3ed8f5d65fc6e5825d4e60c89
parent4896c548b494c8dcfae2316d41bd2fe9cd4838af
parent6e269ec6fe9afd7a37b0bc4c67f1cc619eab32ef
Merge "Logging improvements when NetworkCapabilities change" into oc-dr1-dev
am: 6e269ec6fe

Change-Id: I4f6cbc0adb461cef6610460daeba72ca38b8f10c
core/java/android/net/NetworkCapabilities.java
services/core/java/com/android/server/ConnectivityService.java