Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f40d9b8d authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

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

* changes:
  Merge "WifiManager.getCountryCode(): Change permission to NETWORK_SETTINGS" into rvc-dev am: 26db1f92 am: c696aca6 am: 0506cba8 am: b46d6c1c
  Merge "Revert "Shell: Grant NETWORK_STACK permission for CTS"" into rvc-dev am: 7637ab6f am: da4e47c2 am: b404ca55 am: 98e17069
parents c80c44e7 f5742f6a
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment