Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase

1 files changed, 0 insertions, 27 deletions

diff --git a/proguard-rules.txt b/proguard-rules.txt
deleted file mode 100644
index f39d07c5..00000000
--- a/proguard-rules.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in /home/sam/android-sdk-linux/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
--dontwarn javax.naming.**
-
--keep class * extends java.util.ListResourceBundle {
-    protected Object[][] getContents();
-}
-
--keepnames class * implements android.os.Parcelable {
-    public static final ** CREATOR;
-}