| commit | dc14b9cb71610111775c047fc6130b4d6b07a6f0 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 08:01:04 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 08:01:04 2020 +0000 |
| tree | af233de022dd72d5af4b23d97301399d8dad76bd | |
| parent | c8808c51162b3e4c5100ae96d3d04160f90f77d2 [diff] | |
| parent | 3a0a0d147a7afae57868cbee45326f7704169431 [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 3019727fb1 am: 406bb03753 -s ours am: e0d5709833 -s ours am: 3a0a0d147a -s ours am skip reason: Change-Id Ib0904bbbd0d3b7888bbddafb149b93e6b657a3cd with SHA-1 eec6fe721a is in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/1431589 Change-Id: I371b4c7d43861984ace1437a1bb511dddc6612c6