tree 96be75c64894816df5ff33c1ebeb3c7389f108e6
parent ce374538d5bc92e6a0d06e5904b682acb1fde0c2
parent 2d8ed7eddedc9dcd9471c2bcbaef17c194b97d7a
author Roshan Pius <rpius@google.com> 1570506645 -0700
committer android-build-merger <android-build-merger@google.com> 1570506645 -0700

Merge "ConnectivityService: Grant networkstack uid extra privileges" am: 04665dbfcc am: 24487ef5a6
am: 2d8ed7edde

Change-Id: Ib7c3190806733244672a38822febd7f2d37195b6