tree 642246554324abac95205c2f27a6f429af71a6eb
parent bfdca53076edc89df9186c947ef46ffe39b7883a
parent c4c63c44e6231db63dc73aacd3c7f41ae01cbf7f
author Xin Li <delphij@google.com> 1591632483 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591632483 +0000

[automerger skipped] Merge QQ3A.200605.002 into master am: 9c39ee4eb3 -s ours am: c4c63c44e6 -s ours

am skip reason: Change-Id Id8e138e9a29ac8376e246b6bbfb9c61a52a84735 with SHA-1 e1587bb421 is in history

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

Change-Id: Ia2d829b9b83ef87042ec3abeb6a16c558ecc46e3