bd2c03890ee681030b99d4823a3f98a315f37238
42468bf0c0 -s ours am: 4b83349d05 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20594784 Change-Id: I0bc059edde7bf72a38e8c4e44a7bd018110d6b61 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.7%
Kotlin
10.3%