| commit | 3a0a0d147a7afae57868cbee45326f7704169431 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 07:00:58 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 07:00:58 2020 +0000 |
| tree | af233de022dd72d5af4b23d97301399d8dad76bd | |
| parent | 48759dde6089db590103060dc15fb85643b5e998 [diff] | |
| parent | e0d570983377ea98ad65891f89d0773509bed972 [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 3019727fb1 am: 406bb03753 -s ours am: e0d5709833 -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: I86b4511ec419a9fe917daf2362d98c4717a01f5a