tree ff3a1715d4049d04f8ee9862a91897403e437392
parent 00f3c4333e37a7f02320abc8293e692bf0c41b14
author Pavel Maltsev <pavelm@google.com> 1520466032 +0000
committer Pavel Maltsev <pavelm@google.com> 1522190749 +0000

Merge "Minor clean-up in NetworkCapabilities" am: 539f85a18d am: b1e2bfe4df
am: 8a956a5141

Bug: 72828388
Test: frameworks/base/tests/net/ -c android.net.NetworkCapabilitiesTest

Change-Id: I2f45d2c70c7c0142ae3b3ce9e6329c5f25b63380
(cherry picked from commit feb8d1498a822730e29cf346fe3382e3f5293a58)