diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2014-11-01 13:51:05 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2014-11-01 13:51:05 +0100 |
| commit | a0f694ea44b9d68390846b48d720f9a37fd679b8 (patch) | |
| tree | 38ee04006e38197fd8009697b8975007ec0f45c8 /libs/MemorizingTrustManager/AndroidManifest.xml | |
| parent | 142384e5805d93887d185c9a5b74d4850e4ec719 (diff) | |
| parent | 46f147a82c6b161e071f717c7686f8b78a20aaf1 (diff) | |
Merge pull request #600 from SamWhited/gradle
Build system and library changes (Gradle / Subtree merging)
Diffstat (limited to 'libs/MemorizingTrustManager/AndroidManifest.xml')
| m--------- | libs/MemorizingTrustManager | 0 | ||||
| -rw-r--r-- | libs/MemorizingTrustManager/AndroidManifest.xml | 11 |
2 files changed, 11 insertions, 0 deletions
diff --git a/libs/MemorizingTrustManager b/libs/MemorizingTrustManager deleted file mode 160000 -Subproject fad835037adc1bd313bb56b694426fca4eb6734 diff --git a/libs/MemorizingTrustManager/AndroidManifest.xml b/libs/MemorizingTrustManager/AndroidManifest.xml new file mode 100644 index 00000000..c125afe4 --- /dev/null +++ b/libs/MemorizingTrustManager/AndroidManifest.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="de.duenndns.ssl" + android:versionCode="1" + android:versionName="1.0"> + + <application android:label="MemorizingTrustManager"> + <activity android:name="de.duenndns.ssl.MemorizingActivity" + android:theme="@android:style/Theme.Translucent.NoTitleBar" /> + </application> +</manifest> |