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

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

Merge tag 'android-10.0.0_r37' into staging/lineage-17.1_merge-android-10.0.0_r37

Android 10.0.0 Release 37 (QQ3A.200605.001)

* tag 'android-10.0.0_r37': (34 commits)
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Hide unprovisioned MDN (phone number) at select profile dialog
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  5G meteredness for telephony framework
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  DO NOT MERGE - Track framework changes to crashApplication
  DO NOT MERGE
  Fix pendingIntent in SettingsSliceProvider could be Hijacked
  Revert "DO NOT MERGE - Track framework changes to crashApplicati..."
  Import translations. DO NOT MERGE
  Fix security issue for using mock location without permission.
  [Wi-Fi] Ignore incorrect user certificates
  RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen
  RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen
  RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen
  [Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null
  ...

Conflicts:
	res/values-ar/strings.xml
	res/values-da/strings.xml
	res/values-eu/strings.xml
	res/values-pl/strings.xml
	res/values/config.xml

Change-Id: Ie4891ecd7a81d5f08e3a4d093dd5514465670fd6
parents 2ac3f1e3 433e9902
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