| commit | c184a471bfd522b89a0a8440d3fd43e26afa4265 | [log] [tgz] |
|---|---|---|
| author | Ale Nijamkin <nijamkin@google.com> | Fri Dec 02 03:27:05 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 02 03:27:05 2022 +0000 |
| tree | 4e25924a70cf170db0a0ae313ba2d8e609274e94 | |
| parent | bc4548b29ef86721ff34c3ca87e6a50c7f84af7b [diff] | |
| parent | 2a557b75fe5326b5c1ecf098f64d8b6f77c5d4b2 [diff] |
Merge "Brings back "Control from locked device" setting." into tm-qpr-dev am: d81ae0a645 am: 2a557b75fe Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20590947 Change-Id: Iefe3c423fae6c6eb720b1b816af196736089067f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>