f3aed71e2fbec175c633155ed9766fa11e4b5bdc
1f139628b3
am: ada410afbe
-s ours
am skip reason: Merged-In I41a041d5878f9930db44775408380d0d4588faba with SHA-1 41ce87729e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20516821
Change-Id: I8b1f31116bf12742c74041d2855615ce18e36075
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%