Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b88ae97 authored by Marcelo Arteiro's avatar Marcelo Arteiro Committed by Automerger Merge Worker
Browse files

Merge "Fixing Material Tokens inheriting wrong theme" into udc-dev am: 406f45f9 am: fd01b24b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22428650



Change-Id: I3de13d21f18006759b31c11cd89bfea619d04320
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9e9808de fd01b24b

core/res/res/values/themes_device_defaults.xml

+124 −124

File changed.

Preview size limit exceeded, changes collapsed.