aa6476ad6f908ff076888d0945f72c5406de4e9d
23412ad94a -s ours am: 97fdb8a7a2 -s ours
am skip reason: Merged-In I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f with SHA-1 fef9b97498 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20533026
Change-Id: Ifaace91bc41f214098a56d65df964e54cfbbbc58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merge "Brings back "Control from locked device" setting." into tm-qpr-dev am:
d81ae0a645 am: 2a557b75fe
Merge "Brings back "Control from locked device" setting." into tm-qpr-dev am:
d81ae0a645 am: 2a557b75fe
Description
No description provided
Languages
Java
89.8%
Kotlin
10.2%