Merge branch 'dev' into playback_state_list
This commit is contained in:
commit
ea8bdd8835
124 changed files with 7962 additions and 6669 deletions
|
|
@ -25,6 +25,7 @@
|
|||
<attr name="search_add" format="reference"/>
|
||||
<attr name="options" format="reference"/>
|
||||
<attr name="play" format="reference"/>
|
||||
<attr name="pause" format="reference"/>
|
||||
<attr name="bug" format="reference"/>
|
||||
<attr name="settings" format="reference"/>
|
||||
<attr name="ic_hot" format="reference"/>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue