| commit | 21e0b3b6dc64a55187b1e0434d055a9759c6bf25 | [log] [tgz] |
|---|---|---|
| author | Karsten Tausche <karsten@fairphone.com> | Fri Mar 19 10:30:53 2021 +0100 |
| committer | Karsten Tausche <karsten@fairphone.com> | Fri Mar 19 10:30:53 2021 +0100 |
| tree | aa86595e1f791e508996c83ef1a4fc90ebcdec96 | |
| parent | 57e798c885037cc81ee30632d493b5347bcd068b [diff] | |
| parent | b17e132d9bbd4375f49f4ec760a21f8eb50f3afd [diff] |
Merge the 2021-03-05 SPL branch from AOSP-Partner * security-aosp-pi-release: [RESTRICT AUTOMERGE] Wait for user to be unlocked before setting up the admin app. Change-Id: I0777173b3f2918721f863c08f0ed07298e12c87c