resolve conflict

This commit is contained in:
Christian Schabesberger 2017-01-22 14:26:01 +01:00
commit 849a45a3ca
23 changed files with 1081 additions and 322 deletions

View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<paths xmlns:android="http://schemas.android.com/apk/res/android">
<external-path name="external_files" path="."/>
</paths>