Hayden 834d647011 Merge remote-tracking branch 'github/Start-screen-hint' into Start-screen-hint ... # Conflicts: # app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java		2016-03-22 19:59:26 -06:00
..
activity_error.xml	made error message be displayed inside erroractivity	2016-02-29 19:23:01 +01:00
activity_play_video.xml	initial changes	2016-02-22 20:28:37 +01:00
activity_videoitem_detail.xml	first commit	2015-09-04 02:15:03 +02:00
activity_videoitem_list.xml	Text hint to start a search	2016-03-22 19:39:31 -06:00
against_drm_fragment.xml	fixed another livestream related issue	2016-03-11 15:43:50 +01:00
exo_player_activity.xml	made exoplayer work with youtube again	2016-02-23 01:56:04 +01:00
fragment_videoitem_detail.xml	merge code, and adjust code	2016-02-05 17:09:29 +01:00
main_bg.xml	Got rid of imageview from testing	2016-03-22 19:55:00 -06:00
paginate_footer.xml	merge code, and adjust code	2016-02-05 17:09:29 +01:00
player_notification_expanded.xml	actual fix for androi 6.0 notification problem	2016-02-21 18:12:00 +01:00
player_notification.xml	actual fix for androi 6.0 notification problem	2016-02-21 18:12:00 +01:00
video_item.xml	merge code, and adjust code	2016-02-05 17:09:29 +01:00