tree aa86595e1f791e508996c83ef1a4fc90ebcdec96
parent 57e798c885037cc81ee30632d493b5347bcd068b
parent b17e132d9bbd4375f49f4ec760a21f8eb50f3afd
author Karsten Tausche <karsten@fairphone.com> 1616146253 +0100
committer Karsten Tausche <karsten@fairphone.com> 1616146253 +0100

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