Sulkta-OSS/straw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master'

Browse source 
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
This commit is contained in:
Adam Howard 2015-11-02 21:29:43 +00:00
commit c32c267889
15 changed files with 226 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/org/schabi/newpipe/VideoItemDetailActivity.java
View file

@ -38,7 +38,6 @@ public class VideoItemDetailActivity extends AppCompatActivity {
private String videoUrl;
private int currentStreamingService = -1;
private Menu menu = null;
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);