Merge branch 'master' into album-actions
This commit is contained in:
commit
9e69136b1d
178 changed files with 628 additions and 514 deletions
|
|
@ -38,7 +38,7 @@
|
|||
android:id="@+id/action_colored_footers"
|
||||
android:checkable="true"
|
||||
android:title="@string/colored_footers"
|
||||
app:showAsAction="never"/>
|
||||
app:showAsAction="never" />
|
||||
|
||||
<item
|
||||
android:id="@+id/action_sleep_timer"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue