chschtsch 29a3cbc688 mering with master		2015-12-14 13:07:54 +03:00
..
java/org/schabi/newpipe	mering with master	2015-12-14 13:07:54 +03:00
res	mering with master	2015-12-14 13:07:54 +03:00
AndroidManifest.xml	merging with master	2015-12-14 13:01:34 +03:00