commit | 3f656eb01849cd90e663c56a8e0f663769cddc8c | [log] [tgz] |
---|---|---|
author | Karsten Tausche <karsten@fairphone.com> | Fri Sep 08 16:26:46 2023 +0200 |
committer | Karsten Tausche <karsten@fairphone.com> | Fri Sep 08 16:26:46 2023 +0200 |
tree | 573da123179081b172edcbf563ab86c35c0dce2c | |
parent | 6e1b3874cae56ca0731323c9defbd7f2ea5ac864 [diff] | |
parent | 0a88b1323001939feaf41bb6b4b3beb7a94ea01c [diff] |
Merge branch 'security-aosp-tm-release' into int/13/fp3 * security-aosp-tm-release: RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() [RESTRICT AUTOMERGE] Restrict ApnEditor settings Change-Id: Ie5cbf12ca685b26ea5d02ca2bed6cc4a6f9db1ab