145b0966a050fd83fb64c55a7277785efdfc851a
9848eb9053
am: b3d17fded1
-s ours
am skip reason: Merged-In I78b47e8c55382ceef90329547231124db2ca27d9 with SHA-1 fd96488e5e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22163925
Change-Id: Ic0f310e9f657c1319898ed8bbb26561147f87cbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merge "Use GlifLayout#setDescriptionText in SetupChooseLockGenericFragment" into tm-qpr-dev am:
3a2ef6db2f
am: 0067e9581b
am: 2034c0c395
am: 05f2c3221a
Merge "Use GlifLayout#setDescriptionText in SetupChooseLockGenericFragment" into tm-qpr-dev am:
3a2ef6db2f
am: 0067e9581b
am: 2034c0c395
am: 05f2c3221a
…
Description
No description provided
Languages
Java
89.8%
Kotlin
10.2%