commit | 4faba0b79551974d284a5211c68e627ca8bd2a3f | [log] [tgz] |
---|---|---|
author | Kevin F. Haggerty <haggertk@lineageos.org> | Wed Apr 03 06:36:40 2024 -0600 |
committer | Kevin F. Haggerty <haggertk@lineageos.org> | Wed Apr 03 06:36:53 2024 -0600 |
tree | 10e775c95341f1cd6655f3b4256b6242da7d6946 | |
parent | fe01b2f53d677b2ebcc3959d2a83dacd592ae2ba [diff] | |
parent | 76f5427d334efa34c71aa277a39329c02abd480a [diff] |
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