834d647011
# Conflicts: # app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java |
||
---|---|---|
.. | ||
java/org/schabi/newpipe | ||
res | ||
AndroidManifest.xml |
834d647011
# Conflicts: # app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java |
||
---|---|---|
.. | ||
java/org/schabi/newpipe | ||
res | ||
AndroidManifest.xml |