tree d6ac3f2df305e2debbfcb858f6521d4cc09ece1c
parent 68f48673c7e9e1295881b3e8a253959eded61c0f
parent f2ac860b7c2c43a5166916dd97746c048a1a9f73
author Hugo Benichi <hugobenichi@google.com> 1502885649 +0000
committer android-build-merger <android-build-merger@google.com> 1502885649 +0000

Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities" am: b35719a057 am: 2f9fd9df23
am: f2ac860b7c

Change-Id: I01e287b4df82a53a522566d33b3166f7801badca