summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeng-Hui Zhu <ztenghui@google.com>2012-09-30 14:35:31 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-09-30 14:35:31 -0700
commit1d743975d46be4edb0e354412c21a964bb58bd6b (patch)
tree29f7f93bc573b60ac51d8520cab2cd38b245d290
parentebfc85abc65689b56228900ea00454f842b87d61 (diff)
parent1cd0fd2822ecc60adb09c90c27194ea8019ab59c (diff)
downloadandroid_packages_apps_Gallery2-1d743975d46be4edb0e354412c21a964bb58bd6b.tar.gz
android_packages_apps_Gallery2-1d743975d46be4edb0e354412c21a964bb58bd6b.tar.bz2
android_packages_apps_Gallery2-1d743975d46be4edb0e354412c21a964bb58bd6b.zip
am 1cd0fd28: Merge "Trimming: support more box by keeping more classes" into gb-ub-photos-arches
* commit '1cd0fd2822ecc60adb09c90c27194ea8019ab59c': Trimming: support more box by keeping more classes
-rw-r--r--proguard.flags2
1 files changed, 1 insertions, 1 deletions
diff --git a/proguard.flags b/proguard.flags
index 7cd6c19c1..21b617957 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -50,5 +50,5 @@
-keepattributes *Annotation*
# Required for mp4parser
--keep public class * extends com.coremedia.iso.boxes.AbstractBox
+-keep public class * implements com.coremedia.iso.boxes.Box