Merge branch 'dev' into patch1_ui
This commit is contained in:
commit
5318e77035
41 changed files with 1862 additions and 583 deletions
|
|
@ -5,6 +5,6 @@
|
|||
|
||||
<item android:id="@+id/action_history_clear"
|
||||
android:orderInCategory="940"
|
||||
android:title="@string/clear_history"
|
||||
android:title="@string/clear_views_history_title"
|
||||
app:showAsAction="never"/>
|
||||
</menu>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue