f64b08cee4f286f7960ccb87cfb4f424df3715b1
19ca5d6a6e -s ours am: dc399ade52 -s ours am: 7e131d0b94 -s ours am: b17a40e1ae -s ours am: b893175b4b -s ours
am skip reason: Merged-In I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0 with SHA-1 77a23c9ce2 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2487246
Change-Id: Icdd71d3ab2efd14c30fa0dc7b781f177e1f381a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merge "Add home controls button to screensaver settings" into tm-qpr-dev am:
148f1592ef am: 5671ddb191 am: d17cb44367 am: c1e0f6f3ea
Merge "Update incompatible charging string for different product" into udc-dev am:
36d78f8fe0 am: 56c868f611
Merge "Add home controls button to screensaver settings" into tm-qpr-dev am:
148f1592ef am: 5671ddb191 am: d17cb44367 am: c1e0f6f3ea
Merge "Add home controls button to screensaver settings" into tm-qpr-dev am:
148f1592ef am: 5671ddb191 am: d17cb44367 am: c1e0f6f3ea
…
Description
No description provided
Languages
Java
89.8%
Kotlin
10.2%