resolve merge conflicts of 32a0ea311513a9bc11e8bb30e4fc13d00b9bcd5b to sc-v2-dev-plus-aosp
Bug: 191109888
Bug: 181901105
Change-Id: Iabcb346f727082d6b4a5c67be653ea64ba45c223
Merged-In: Ia904b8b96301042c900e0589f33fc625c1c1148b
diff --git a/res/values-v31/colors.xml b/res/values-v31/colors.xml
index dc0c7a0..e004dd2 100644
--- a/res/values-v31/colors.xml
+++ b/res/values-v31/colors.xml
@@ -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>