diff options
author | Sam Whited <sam@samwhited.com> | 2014-10-30 15:20:20 -0400 |
---|---|---|
committer | Sam Whited <sam@samwhited.com> | 2014-10-30 15:33:13 -0400 |
commit | 46f147a82c6b161e071f717c7686f8b78a20aaf1 (patch) | |
tree | 38ee04006e38197fd8009697b8975007ec0f45c8 /src/main/AndroidManifest.xml | |
parent | 142384e5805d93887d185c9a5b74d4850e4ec719 (diff) | |
parent | a362bd10214b16f8939c12a1dd4376667fe0d49f (diff) |
Merge branch 'gradle' into development
Conflicts:
.gitignore
CHANGELOG.md
README.md
libs/MemorizingTrustManager
libs/minidns
libs/openpgp-api-lib
Diffstat (limited to '')
-rw-r--r-- | src/main/AndroidManifest.xml (renamed from AndroidManifest.xml) | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/AndroidManifest.xml b/src/main/AndroidManifest.xml index da8d38c5..7bde645f 100644 --- a/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -1,13 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" - package="eu.siacs.conversations" - android:versionCode="32" - android:versionName="0.8" > - - <uses-sdk - android:minSdkVersion="14" - android:targetSdkVersion="19" /> + package="eu.siacs.conversations"> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> |