tree af233de022dd72d5af4b23d97301399d8dad76bd
parent 869a857e7e531d70df238490971155e555485408
parent 21e6f25ab0f0ef075afc11d34efa59c2a2396546
author Treehugger Robot <treehugger-gerrit@google.com> 1600056536 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600056536 +0000

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

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

Change-Id: I6e0614d117f8a4912a28cb140c075519d70273eb