Merge branch 'dev' into patch-7
This commit is contained in:
commit
6a35494ef1
119 changed files with 420 additions and 688 deletions
|
|
@ -517,5 +517,6 @@
|
|||
<string name="minimize_on_exit_none_description">None</string>
|
||||
<string name="minimize_on_exit_background_description">Minimize to background player</string>
|
||||
<string name="minimize_on_exit_popup_description">Minimize to popup player</string>
|
||||
<string name="switch_view">Switch View</string>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue