summaryrefslogtreecommitdiffstats
path: root/src_pd/com/android
diff options
context:
space:
mode:
authorJohn Hoford <hoford@google.com>2012-10-22 19:58:11 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-22 19:58:11 -0700
commitb1494159c9a61b04d73dc1b4eeccf22d8444a8e6 (patch)
treef22793a98035b97beb91a5d6ca1408d3491a6f41 /src_pd/com/android
parent3f8c855cc55329b27796d6df5f7861184cea4e1c (diff)
parent072e41e2c00abdc8f7e780679b5a943d41c6f1e6 (diff)
downloadandroid_packages_apps_Snap-b1494159c9a61b04d73dc1b4eeccf22d8444a8e6.tar.gz
android_packages_apps_Snap-b1494159c9a61b04d73dc1b4eeccf22d8444a8e6.tar.bz2
android_packages_apps_Snap-b1494159c9a61b04d73dc1b4eeccf22d8444a8e6.zip
am 5fbfe6f1: on entry check if Tiny Planet if not remove UI
* commit '5fbfe6f1d1f407e68b7334c6a5988f20bcf16d79': on entry check if Tiny Planet if not remove UI
Diffstat (limited to 'src_pd/com/android')
-rw-r--r--src_pd/com/android/gallery3d/util/XmpUtilHelper.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src_pd/com/android/gallery3d/util/XmpUtilHelper.java b/src_pd/com/android/gallery3d/util/XmpUtilHelper.java
index 7cbd7f170..88b813dea 100644
--- a/src_pd/com/android/gallery3d/util/XmpUtilHelper.java
+++ b/src_pd/com/android/gallery3d/util/XmpUtilHelper.java
@@ -16,11 +16,13 @@
package com.android.gallery3d.util;
+import com.adobe.xmp.XMPMeta;
+
import java.io.InputStream;
public class XmpUtilHelper {
- public static Object extractXMPMeta(InputStream is) {
+ public static XMPMeta extractXMPMeta(InputStream is) {
return null;
}