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

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

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

* changes:
  Merge "WifiManager.getCountryCode(): Change permission to NETWORK_SETTINGS" into rvc-dev am: 26db1f92 am: d64c0111 am: 29dce845
  Merge "Revert "Shell: Grant NETWORK_STACK permission for CTS"" into rvc-dev am: 7637ab6f am: c19fcf80 am: d97371af
parents f40d9b8d c09f8f22
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