Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychain

2014-03-05 17:05:01 +01:00
parent 76876a57c2 a1230bbe53
commit bc5f2a9305
109 changed files with 1849 additions and 2495 deletions
--- a/libraries/HtmlTextView/project.properties
+++ b/libraries/HtmlTextView/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt

 # Project target.
-target=android-17
+target=android-19
 android.library=true