Commit c1f4d78e 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 am: 32a2a99c -s ours

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

Change-Id: I00a29862733b57decf62241abdc7582cacd156e6

parents 0b7e2083 32a2a99c

There are no changes