tree ccf86f66bf7428b5aa560c787b5e0bd76166e11d
parent 51d5c4e361fabed4d4e5a8c990ff718ad1b0c4a1
parent 337f94ffcff8139dbcdeb0b38f53497d1861340b
author Android Build Merger (Role) <android-build-merger@google.com> 1502908998 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1502908998 +0000

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