tree fa6891fd4f79f271dec918888914fe3842c65829
parent f7149eb698c4b624c75f3f3a8b1a1b3093efbf8b
parent cb3c24e36b9efad8adeb72b5f814bf35c5db60bb
author Hugo Benichi <hugobenichi@google.com> 1503057542 +0000
committer android-build-merger <android-build-merger@google.com> 1503057542 +0000

Merge "Really allow NetworkAgent immutable updates to NetworkCapabilities"
am: cb3c24e36b

Change-Id: Ifbdd005576b3f0fbf278ecec81ce3e4308c6276d