tree 642246554324abac95205c2f27a6f429af71a6eb
parent 17c38c5380e1aef82d984ccd733674daa3a4b00e
parent 1a71605a1f3b332eb72cad9a34900f6acac33546
author Xin Li <delphij@google.com> 1591633762 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591633762 +0000

[automerger skipped] Merge QQ3A.200605.002 into master am: 9c39ee4eb3 -s ours am: c4c63c44e6 -s ours am: 1a71605a1f -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: I605698039026e94b94e385731e0bd7d3e16dcb39