Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities" into oc-mr1-dev

am: 3f04e31eee  -s ours

Change-Id: Ifd70f2e30efc2d16b32fb140622698a36d506adf
This commit is contained in:
Hugo Benichi
2017-08-18 11:58:55 +00:00
committed by android-build-merger

Diff Content Not Available