LastPipeBender/app/src/main/java/org
Adam Howard c32c267889 Merge remote-tracking branch 'upstream/master'
Conflicts:
	app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java -- still used class-based passing
	app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java -- just some whitespace
2015-11-02 21:29:43 +00:00
..
schabi/newpipe Merge remote-tracking branch 'upstream/master' 2015-11-02 21:29:43 +00:00