summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2013-02-16 00:01:05 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-02-16 00:01:06 +0000
commitb82dbc6173b8b51134dce95a5ff598a1e95841f9 (patch)
treefa80cc930c923ac78185fdfaec73ae8a1ce08436 /src
parent2d64826989a6a0da1e8e31ebe3317c04abfac117 (diff)
parenta864120f302da2b91bdf5af982f62b17e634dabe (diff)
downloadandroid_packages_apps_Snap-b82dbc6173b8b51134dce95a5ff598a1e95841f9.tar.gz
android_packages_apps_Snap-b82dbc6173b8b51134dce95a5ff598a1e95841f9.tar.bz2
android_packages_apps_Snap-b82dbc6173b8b51134dce95a5ff598a1e95841f9.zip
Merge "Remove com.android.camera.R" into gb-ub-photos-bryce
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/PreviewGestures.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/camera/PreviewGestures.java b/src/com/android/camera/PreviewGestures.java
index 2dccc3e45..cb7ca09c7 100644
--- a/src/com/android/camera/PreviewGestures.java
+++ b/src/com/android/camera/PreviewGestures.java
@@ -27,6 +27,7 @@ import android.view.ViewConfiguration;
import com.android.camera.ui.PieRenderer;
import com.android.camera.ui.RenderOverlay;
import com.android.camera.ui.ZoomRenderer;
+import com.android.gallery3d.R;
import java.util.ArrayList;
import java.util.List;