tree a237411f0dd510e4dbb41b14acf681ac11090892
parent 0593c370985ffe5f605c9f18de10c5196e5a129e
parent 64ec075206cc4da5fcf3f6c28de724957a174a65
author Roshan Pius <rpius@google.com> 1560925602 -0700
committer android-build-merger <android-build-merger@google.com> 1560925602 -0700

Merge "NetworkStackClient: Allow modules with network_stack uid" am: 891422900d am: e4b2d05705 am: beec6d629a
am: 64ec075206

Change-Id: I10c48fe9a926fd14f84cd1bfb434ac0286b39bd4