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

Unverified Commit b8e2da3d authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-security-15.0.0_r12' into staging/lineage-22.2_merge-android-security-15.0.0_r12

Android security 15.0.0 release 12

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCaS3hJwAKCRDorT+BmrEO
# eJUpAJ44MD+8HN4maOpp2NSEJnnBsLcYlQCghVosZzDAH2gs0VSABwSDiiXNNOk=
# =uLjs
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon Dec  1 20:40:39 2025 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [ultimate]

* tag 'android-security-15.0.0_r12':
  Import translations. DO NOT MERGE ANYWHERE
  Backport BT pairing dialog changes
  [nfc] Fix string injection in default payment app selector
  Hide sensistive content from locked profiles
  Prevent SettingsSliceProvider from accessing unused packages

 Conflicts:
	res/values-zh-rCN/strings.xml

Change-Id: If3cf1a3f03a93b3ae4373680f02d23ca7006677b
parents b396fba2 05e78627
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