tree 566f5fc32187dcf6ee5471a879720fb6b711a6b4
parent 54916e10e8bc0611c4fbb2be8f1f34a2d3a9417b
parent df2a22f104c7fda5ba0aec51cd67f8ccb7a5d51a
author Treehugger Robot <treehugger-gerrit@google.com> 1639553006 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1639553006 +0000

Merge "Settings: Extend the data role swap timeout value" am: bb994f627f am: df2a22f104

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1912875

Change-Id: I0d456509b02715b141a6110ef89a476995ce5d67