Jonathan Miranda c79afdd09f resolve merge conflicts of 32a0ea3115 to sc-v2-dev-plus-aosp ...

Bug: 191109888
Bug: 181901105
Change-Id: Iabcb346f727082d6b4a5c67be653ea64ba45c223
Merged-In: Ia904b8b96301042c900e0589f33fc625c1c1148b

2021-06-15 15:28:30 +00:00

..

colors.xml

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

2021-06-15 15:28:30 +00:00

config.xml

Revert "Revert "Update preferences to Material Next styling""

2021-06-11 16:04:35 -04:00

styles.xml

Revert "Revert "Update preferences to Material Next styling""

2021-06-11 16:04:35 -04:00