diff options
author | Scott Jackson <daneren2005@gmail.com> | 2015-12-29 17:34:40 -0800 |
---|---|---|
committer | Scott Jackson <daneren2005@gmail.com> | 2015-12-29 17:34:40 -0800 |
commit | 675ec2eaaa3f852d16f46d32309bc4d989e4e47b (patch) | |
tree | d77b8d071445841f9eb92007f3f187a139144642 /app/src/main/res/values/attrs.xml | |
parent | 5ea1b72af8447c246bcce0bbfd11c24b2e949c8d (diff) | |
parent | af756408a09d85d07b84dcce32828056683512db (diff) | |
download | dsub-675ec2eaaa3f852d16f46d32309bc4d989e4e47b.tar.gz dsub-675ec2eaaa3f852d16f46d32309bc4d989e4e47b.tar.bz2 dsub-675ec2eaaa3f852d16f46d32309bc4d989e4e47b.zip |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'app/src/main/res/values/attrs.xml')
-rw-r--r-- | app/src/main/res/values/attrs.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index c4f80478..e4fa4b5a 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -55,6 +55,7 @@ <attr name="actionbarBackgroundColor" format="reference"/> <attr name="drawerTitleStyle" format="reference"/> <attr name="drawerSubtitleStyle" format="reference"/> + <attr name="cardBackgroundColor" format="reference"/> <declare-styleable name="SeekBarPreference"> <attr name="min" format="integer"/> |