OSDN Git Service

Merge "Improve NetworkCapabilities docs." am: 14a51058b1 am: b385ba095b
authorJeff Sharkey <jsharkey@android.com>
Wed, 25 Oct 2017 17:54:35 +0000 (17:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 25 Oct 2017 17:54:35 +0000 (17:54 +0000)
commit9cd92adb39ead953905a97119d74666cfe1bc90d
treeba7814b871a1ad1e0023620d98c651904bc60815
parent8664028d4f0642ea44c83f87a85184813ac39972
parentf9ae47c5da569d075ea13e16be48e7e033bf5330
Merge "Improve NetworkCapabilities docs." am: 14a51058b1 am: b385ba095b
am: f9ae47c5da

Change-Id: I33ef6f930529f9c6e8502613633fffccaa18c192
core/java/android/net/NetworkCapabilities.java