merged upstream/dev, changes for peertube support

This commit is contained in:
Ritvik Saraf 2019-03-10 01:02:25 +05:30
commit d90b1ca5be
187 changed files with 6831 additions and 3208 deletions

View file

@ -40,6 +40,10 @@
<attr name="ic_add" format="reference"/>
<attr name="ic_restore_defaults" format="reference"/>
<attr name="ic_blank_page" format="reference"/>
<attr name="ic_list" format="reference"/>
<attr name="ic_grid" format="reference"/>
<attr name="ic_delete" format="reference"/>
<attr name="ic_settings_update" format="reference"/>
<!-- Can't refer to colors directly in drawable's xml-->
<attr name="toolbar_shadow_drawable" format="reference"/>