Merge "resolve merge conflicts of 32a0ea3115 to sc-v2-dev-plus-aosp" into sc-v2-dev-plus-aosp

This commit is contained in:
TreeHugger Robot
2021-06-15 17:14:31 +00:00
committed by Android (Google) Code Review
-2
View File
@@ -41,7 +41,6 @@
<color name="folder_dot_color">@android:color/system_accent2_50</color>
<color name="home_settings_header_accent">@android:color/system_accent1_600</color>
<color name="home_settings_header_collapsed">@android:color/system_neutral1_100</color>
<color name="home_settings_header_expanded">@android:color/system_neutral1_50</color>
@@ -51,5 +50,4 @@
<color name="home_settings_thumb_off_color">@android:color/system_neutral2_100</color>
<color name="home_settings_track_on_color">@android:color/system_accent1_600</color>
<color name="home_settings_track_off_color">@android:color/system_neutral2_600</color>
</resources>