Merge changes from topic "am-ebe6a55c4bf44c59bdb5f50390eadb40" into rvc-qpr-dev-plus-aosp

Browse Source

* changes:
  Merge "WifiManager.getCountryCode(): Change permission to NETWORK_SETTINGS" into rvc-dev am: 26db1f9278 am: d64c011192 am: 29dce8457c
  Merge "Revert "Shell: Grant NETWORK_STACK permission for CTS"" into rvc-dev am: 7637ab6f52 am: c19fcf800b am: d97371af66

...

This commit is contained in:

Automerger Merge Worker

2020-03-10 22:06:16 +00:00

committed by Android (Google) Code Review

parent f40d9b8d77 c09f8f22d2

commit 633b470b46

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