72bfbdd79e2b3e94967ac7b466c507f1bde18fb9
1dd3fefa93 am: 88c9b00bac -s ours
am skip reason: Merged-In I1fcc8b3ecd42859af591a7b250edfedbbdf204e4 with SHA-1 391a34f7d5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20592595
Change-Id: I5ace273fafbca130bff07d5dbac09a9fa98e251a
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%