230c71301af440170923cae527c92ef781c2256e
86efc1e18e -s ours am: ccba0e07ca -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20596334 Change-Id: I74ddab9f2d9da665d6733de476825df64e793e04 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%