tree af233de022dd72d5af4b23d97301399d8dad76bd
parent 9ec0e3057c1234a8eecb3d8d1c4ad599cc88125e
parent c1e6d9f82b81380a6ba6c259325e6f24d95afbe0
author Treehugger Robot <treehugger-gerrit@google.com> 1600060236 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600060236 +0000

Merge "usesCleartextTraffic in NetworkPermissionConfig" am: 46dc3a25e0 am: 21e6f25ab0 am: f30857ae42 am: c1e6d9f82b

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/1420011

Change-Id: I49468ccb24f08d6ff7f47ebf70c82a6ebfa823f0