Commit 13719e51 authored Apr 17, 2020 by Aaron Huang Committed by Automerger Merge Worker Apr 17, 2020

[automerger skipped] Merge "This contains a squash of two changes...

[automerger skipped] Merge "This contains a squash of two changes >>>>>>>>>>>>>>>>>>>>>> aosp/1284588 Adjust permission of NetworkProvider related API" into rvc-dev am: 96f705db -s ours am: d4252a74 -s ours

am skip reason: Change-Id Ic9809e731aa811a51c2f82d189372169d99a5ed9 with SHA-1 1aa791cd is in history

Change-Id: Iec99573d8584492622e1caf85b9879ec63dada8b

parents c1f4d78e d4252a74

There are no changes