chore(merging-upstream): bunch of conflicts to solve
This commit is contained in:
@@ -15,5 +15,5 @@
|
||||
android:paddingLeft="24dp"
|
||||
android:paddingRight="24dp"
|
||||
android:drawablePadding="24dp"
|
||||
android:drawableTint="?colorM3OnSurfaceVariant"
|
||||
android:drawableTint="?android:textColorPrimary"
|
||||
tools:text="List Item"/>
|
||||
Reference in New Issue
Block a user