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

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

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

Android Security 13.0.0 Release 16 (11422632)

* tag 'android-security-13.0.0_r16':
  [RESTRICT AUTOMERGE] Restrict WifiDialogActivity

Conflicts:
	src/com/android/settings/wifi/WifiDialogActivity.java
	tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java

Change-Id: I1a09fbdc1c92ec0112df350a5053c70984d05f15
parents fe01b2f5 76f5427d
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