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

Unverified Commit 34a06070 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-16.0.0_r3' into staging/lineage-23.0_merge-android-16.0.0_r3

Android 16.0.0 Release 3 (BP3A.250905.014)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCaRO/HAAKCRDorT+BmrEO
# eAZ7AJsHhdCu5OPaH0ZbNmTfH1hjeV5HTwCgiaWnEXPjJO2DEXNd8dNY/Orlyow=
# =Q1Vt
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed Nov 12 00:56:28 2025 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [ultimate]

# By Bill Yi (8) and others
# Via Android Build Coastguard Worker (15) and Android (Google) Code Review (1)
* tag 'android-16.0.0_r3':
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Show account selection dialog when a single account exists.
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Integrate CP2 Android B Default Account APIs
  Bump minSdk to 36
  Format files needed for Android B integration
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE

 Conflicts:
	src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java
	src/com/android/contacts/list/DefaultContactBrowseListFragment.java
	src/com/android/contacts/model/AccountTypeManager.java
	src/com/android/contacts/model/DeviceLocalAccountLocator.java
	src/com/android/contacts/preference/DisplayOptionsPreferenceFragment.java
	src/com/android/contacts/quickcontact/QuickContactActivity.java

Change-Id: I9950257d9bcb8d8be09ddd56a705ba432a99a5f0
parents 3751e5b5 309e0004
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