Merge "Merge "Updates the padding of the reset button to meet for SetupWizard style." into tm-dev am: fc481ece26 am: 46f70f8fd1" into tm-d1-dev-plus-aosp am: 20b920737a am: d42ed79848
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18349802 Change-Id: I261963a20bd4833d14eb15966b2deb991089c61b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: