| commit | 4b80558bc6d8630a0517ef77adde6cc4aa1ac499 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 06:58:07 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 06:58:07 2020 +0000 |
| tree | af233de022dd72d5af4b23d97301399d8dad76bd | |
| parent | eba575b048b4e14736d3c80566ca57ae5598bf73 [diff] | |
| parent | f14a686fa8b7c4b6348c01dcd73c56c1a0bdb331 [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 3019727fb1 am: 406bb03753 -s ours am: e0d5709833 -s ours am: f14a686fa8 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/1431589 Change-Id: Ifb721d86acdb5ed2d547f695aa79f5bea63942f3