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
..
src	Merge remote-tracking branch 'github/Start-screen-hint' into Start-screen-hint	2016-03-22 19:59:26 -06:00
.gitignore
build.gradle	moved on to version 0.7.7	2016-03-08 01:10:33 +01:00
proguard-rules.pro