Merge branch 'master' of /Users/karim/Code/AndroidProjects/Phonograph with conflicts.

This commit is contained in:
Karim Abou Zeid 2016-01-27 12:13:53 +01:00
commit e7769b8c5d
3 changed files with 5 additions and 22 deletions

View file

@ -8,7 +8,6 @@
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:scrollbars="none" />
<TextView