OSDN Git Service

Merge "Define NOT_ROAMING network capability." am: 8f380ab29c am: 3fe1ae29cd
authorJeff Sharkey <jsharkey@android.com>
Fri, 3 Nov 2017 23:18:45 +0000 (23:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Nov 2017 23:18:45 +0000 (23:18 +0000)
commite4595d58b6c8d0a4495d089a826f42cb3ca46b85
tree05a1e0310b6bdd238380e0a5efe1ba13caa143c4
parent92a948e4cb8cfa026487884e4fb1e91a66e85fc4
parent69b31d4eb07586f4bd89b73a3009d224edee061c
Merge "Define NOT_ROAMING network capability." am: 8f380ab29c am: 3fe1ae29cd
am: 69b31d4eb0

Change-Id: I04220ff55fc87dbf8d417a30f15a06a877b412d4
api/current.txt
api/system-current.txt
api/test-current.txt
core/java/android/net/NetworkCapabilities.java
services/core/java/com/android/server/ConnectivityService.java
tests/net/java/android/net/NetworkCapabilitiesTest.java
tests/net/java/com/android/server/net/NetworkStatsServiceTest.java