Merge heads

This commit is contained in:
youtaol
2013-01-29 21:23:35 +08:00
parent 4dd2bbe6af
commit 6e0cdc7434
+13
View File
@@ -23,3 +23,16 @@
# Needed by google-api-client-android when linking against an older platform version
-dontwarn com.google.api.client.googleapis.extensions.android.**
# Additional flags from
# http://stackoverflow.com/questions/14410520/google-drive-api-doesnt-play-well-with-proguard-npe
-keep class com.google.** { *;}
-keep interface com.google.** { *;}
-dontwarn com.google.**
-keepattributes *Annotation*,Signature
-keep class * extends com.google.api.client.json.GenericJson {
*;
}
-keep class com.google.api.services.drive.** {
*;
}