OSDN Git Service

Merge "Minor clean-up in NetworkCapabilities" am: 539f85a18d
authorPavel Maltsev <pavelm@google.com>
Wed, 7 Mar 2018 23:09:04 +0000 (23:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 7 Mar 2018 23:09:04 +0000 (23:09 +0000)
commit8a956a514140d4388d0225e6da6b0326bf0989eb
tree0c622755ce26c5e296d992c8cd3267131b92b593
parent8a8d4ebd55009d97c9a8467cef2de6a1b3cf5c4a
parentb1e2bfe4df954b084c0f81a2c7ea3bf81ee1c9cb
Merge "Minor clean-up in NetworkCapabilities" am: 539f85a18d
am: b1e2bfe4df

Change-Id: Ie6839576f61563f2a82fec53afc42208f5a37f3c
core/java/android/net/NetworkCapabilities.java
tests/net/java/android/net/NetworkCapabilitiesTest.java