[automerger skipped] Merge "This contains a squash of two changes >>>>>>>>>>>>>>>>>>>>>> aosp/1284588 Adjust permission of NetworkProvider related API" into rvc-dev am: 6be2260534 am: 64e475ef4e -s ours am: b0f3c6e6e5 -s ours am: c3e95384b1 -s ours

Browse Source

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

Change-Id: I3ff4cc5733a252ca09e7e3864ecab0f662b8d151

...

This commit is contained in:

Aaron Huang

2020-04-17 11:57:21 +00:00

committed by Automerger Merge Worker

parent 5264d1d113 c3e95384b1

commit 82f86804b6

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available