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

Skip to content
Unverified Commit 34d1b0a1 authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-security-11.0.0_r51' into staging/lineage-18.1_merge-android-security-11.0.0_r51

Android security 11.0.0 release 51

* tag 'android-security-11.0.0_r51':
  Add non system overlay flag to InstallCaCertificateWarning
  Import translations. DO NOT MERGE ANYWHERE
  Rephrase dialog message of clear storage dialog for security concern
  RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission

Conflicts:
	res/values-mk/strings.xml
	res/values-ne/strings.xml
	res/values-uz/strings.xml

Change-Id: I00064ab349b27d5fe903c06ce4f8eff8c40bcbaf
parents 08c1661b 2250e143
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment