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

Skip to content
Unverified Commit 3e75e10a authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-13.0.0_r16' into staging/lineage-20.0_merge-android-13.0.0_r16

Android 13.0.0 Release 16 (TQ1A.221205.011)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCY45r9QAKCRDorT+BmrEO
# eIu9AJ9LTDvELjvd/VCi/3krLTeKYx3R8wCbB+NiqpsnVsKKuZ/40XkPXtm19FU=
# =YZIx
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Dec  6 00:08:53 2022 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 1389 signatures in the past
#      13 months.  Encrypted 4 messages in the past 10 months.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By Bill Yi (11) and others
# Via Automerger Merge Worker (44) and others
* tag 'android-13.0.0_r16':
  Fix misconfigured recovery host test
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  recovery_ui:Add support for multiple connectors switch
  minui: Add API to support multiple connectors detection
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Fix misconfigured recovery host test
  Fix misconfigured recovery host test
  Fix misconfigured recovery host test
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE

 Conflicts:
	recovery_ui/include/recovery_ui/screen_ui.h

Change-Id: I8372bb359dade75a38425096fac4f2ce7220dc35
parents bf94d999 dd67fc9e
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