summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/ui/InLineSettingItem.java
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
commitad16c6799d559d304bb8688e37a02d2d9bc53a42 (patch)
tree41eaca93b6cdc1f1269fef682f3820a15ffed2e5 /src/com/android/camera/ui/InLineSettingItem.java
parent04026a407aca122132ce746a675ac20782f3ab08 (diff)
parent54987e8d3af88214ce4f3aed0b5c4e9ded5b1392 (diff)
downloadandroid_packages_apps_Snap-ad16c6799d559d304bb8688e37a02d2d9bc53a42.tar.gz
android_packages_apps_Snap-ad16c6799d559d304bb8688e37a02d2d9bc53a42.tar.bz2
android_packages_apps_Snap-ad16c6799d559d304bb8688e37a02d2d9bc53a42.zip
Merge "Remove com.android.camera.R" into gb-ub-photos-bryce
Diffstat (limited to 'src/com/android/camera/ui/InLineSettingItem.java')
-rw-r--r--src/com/android/camera/ui/InLineSettingItem.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/ui/InLineSettingItem.java b/src/com/android/camera/ui/InLineSettingItem.java
index 4f88f2738..839a77fd0 100644
--- a/src/com/android/camera/ui/InLineSettingItem.java
+++ b/src/com/android/camera/ui/InLineSettingItem.java
@@ -23,7 +23,7 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import com.android.camera.ListPreference;
-import com.android.camera.R;
+import com.android.gallery3d.R;
/**
* A one-line camera setting could be one of three types: knob, switch or restore