tree 642246554324abac95205c2f27a6f429af71a6eb
parent 30f7b76185a6bdcd11b92e3b24fb0b173e8c1336
parent 76f9e1f2c52797ea5834eb7e87bb8fdb18f81986
author Xin Li <delphij@google.com> 1591634525 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591634525 +0000

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