Automerger Merge Worker 0b1549ed6e Merge "Merge "Do not start biometric auth if encrypted or lockdown" into rvc-dev am: 9253ddb5eb am: ae5825574d am: 8049d9c7d6" into rvc-qpr-dev-plus-aosp am: 35987b8c73 ...

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11840350

Change-Id: I2f4895801cffc25a7d0cf27ddd493e5b947ced85

2020-06-11 21:23:21 +00:00

..

res/layout

…

src/com/android

Merge "Merge "Do not start biometric auth if encrypted or lockdown" into rvc-dev am: 9253ddb5eb am: ae5825574d am: 8049d9c7d6" into rvc-qpr-dev-plus-aosp am: 35987b8c73

2020-06-11 21:23:21 +00:00

Android.mk

…

AndroidManifest-base.xml

…

AndroidManifest.xml

Merge "GlobalActions: Disable IME focusability" into rvc-dev am: 4869550555 am: a44bbba4d9 am: 2f59f928ca am: 72c5146b29

2020-05-11 14:51:12 +00:00

AndroidTest.xml

…